Merge: Redo spelling of Makefile variables to conform to POSIX.