Generalize the Makefile and improve instructions

I hope this is the last change in my process of converging to a rational build process.