Make the Makefiles more portable