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

* commit '58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
  core/Makefile: Allow specification of file locations