Updating Makefile to allow overrides