Minor tidying to make.inc template.
Minor tidying to make.inc template.

Set CPPFLAGS with the VCS info and then add to it with the user
settings.  This makes it easier to change settings for testing (and
harder to accidentally delete the VCS info).

ruthfranklin/hande,hande-qmc/hande,hande-qmc/hande,hande-qmc/hande,hande-qmc/hande,hande-qmc/hande