--- Makefile
+++ Makefile
@@ -19,12 +19,11 @@
 
 SHELL = /bin/sh
 SYSTEM = $(shell uname)
-C++ = g++
-CC = gcc
+C++ = $(CXX)
 DFLAGS = -D__SYS_ZLIB
 OFLAGS =
-LFLAGS = -lbz2 -lz
-CFLAGS = -fPIC
+LFLAGS += -lbz2 -lz
+CFLAGS += -fPIC
 CFLAGS += $(OFLAGS) $(DFLAGS)
 
 OBJS = SCommon.o SCompression.o SFileCompactArchive.o \
@@ -66,8 +65,7 @@
 all: $(LIB)
 
 install: $(LIB)
-	install $(LIB) /usr/local/lib
-	mkdir -p /usr/local/include/StormLib
-	cp StormLib.h /usr/local/include/StormLib
-	cp StormPort.h /usr/local/include/StormLib
-	ldconfig
+	install $(LIB) $(PREFIX)/lib
+	mkdir -p $(PREFIX)/include/StormLib
+	cp StormLib.h $(PREFIX)/include/StormLib
+	cp StormPort.h $(PREFIX)/include/StormLib