Issue #83: Harmonise makefile variables and tidy up makefiles