make changes to Makefile/build scripts to keep up with recent changes