More fixes to Makefile.