makefile now works on both linux and osx