Improved variable use in makefile