Changed the makefile to support a wider variety of systems