Changed makefile to a more permanent solution