Updated Makefile to use more variables making the script more compact.