Pulling in changes to Makefile.in

Not worth upping the version number since this is straight from the original import.