Fixes to Makefile re: installing bootstrap.