(svn-old) Fix up some makefiles