Make the temporary makefile step fully optional