Thu Dec 12 17:38:18 1996  Dan Winship  <danw@mit.edu>

	* Makefile.tmpl: various changes and improvements

