some Makefile changes to please Ubuntu...
Merge branch 'master' into devel