Update Makefile

Now using variables to simplify further changes.