fix up build paths
18 files changed