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

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