Modify makefile to use enviroment variables