Makefile changes

This allows for ease of building in non-standard configurations