Update Makefile

Reverting some variables. Using a buildscript now.