Merge "core/Makefile: Allow specification of file locations"