Modify the Makefile to aid package building