Changes to Makefile to fix building and installing.