Pull out changes to Makefile.in so that t-nelsons autobuild changes apply