Altered makefile to allow both systems to compile