Small changes to the Makefile to compile on OS X again.