am 71195ec7: am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"

* commit '71195ec71fe3498b19ff9ff8e4eb924b8fa507e6':
  core/Makefile: Allow specification of file locations