Makefile changes due to library path changes