BLD: Tweak to Makefile
Merge pull request #3955 from jtratner/makefile-updates

BLD: Tweak to Makefile.