gpmap GF/NC makefile fix, + oops leaving my comments in Makeinc