Makefile improvements: don't make so many assumptions, and configure script.