fix bug in Makefile.buildbot and more simplifications to how packages are built