More fixes for make where sourcedir and builddir are different.