Fixup the makefiles.