Update Makefile to allow overrides