some Makefile changes to please Ubuntu...