fixes to Makefiles informed by issue #154