fix the Makefiles for the normal 'universal' compilation path.