Modified Makefile to use variables correctly