Regenerate Makefile.in, and fix typos in 5eb74fa49b3b34e21c98f85c6db2241c36bc102c