fixed Mac build

Conflicts:
	Makefile.in