More changes to Makefile for make install