Added variables to ensure correct paths are used in top-level and buildbot Makefiles