One more attempt to fix Makefile build