--- ./Makefile.orig	2010-11-23 20:27:16.000000000 +0100
+++ ./Makefile	2013-10-28 13:29:56.337790819 +0100
@@ -7,16 +7,13 @@
 ### Installation directory (Installation prefix)
 # If you don't have root privileges, set this to /home/tentacleman/bloboats/
 # for example, otherwise /. Don't use ~ or other environment variables!
-PREFIX = /
 
 ### Or if you don't want to run make install at all, uncomments the next line
 # and comment the line below. Compile and run with './bin/bloboats'
 #DATADIR = data
 
-DATADIR = $(PREFIX)/usr/games/bloboats/data
-
 ### If you do make install, you may perhaps want to set these
-BINARYDIR = $(PREFIX)/usr/bin
+BINARYDIR = $(PREFIX)/bin
 CONFIGDIR = $(PREFIX)/etc
 
 PRIVATEDIR = ~/.bloboats
@@ -53,13 +50,13 @@
 
 
 ### C++ compiler to be used
-CXX_DEFAULT = g++
+CXX_DEFAULT ?= g++
 CXX_FREEBSD = g++
 CXX_NETBSD = g++
 CXX_MACOSX = g++
 CXX_CROSS = i586-mingw32msvc-g++
 
-CXX = $(CXX_$(TARGET))
+CXX ?= g++
 
 
 ### SDL-Config in your system
@@ -154,14 +151,14 @@
 	echo "#define DEBUG $(DEBUG)" >> src/compiling_settings.h
 
 install:
-	mkdir -p $(BINARYDIR)/
-	mkdir -p $(CONFIGDIR)/
-	cp bloboats.dirs $(CONFIGDIR)/
-	mkdir -p $(DATADIR)/
-	cp -R data/* $(DATADIR)/
-	cp bin/$(BINARY) $(BINARYDIR)/
-	chmod -R 744 $(DATADIR)
-	chmod 755 `find $(DATADIR) -type d`
+	mkdir -p $(STAGEDIR)$(BINARYDIR)/
+	mkdir -p $(STAGEDIR)$(CONFIGDIR)/
+	cp bloboats.dirs $(STAGEDIR)$(CONFIGDIR)/
+	mkdir -p $(STAGEDIR)$(DATADIR)/
+	cp -R data/* $(STAGEDIR)$(DATADIR)/
+	cp bin/$(BINARY) $(STAGEDIR)$(BINARYDIR)/
+	chmod -R 744 $(STAGEDIR)$(DATADIR)
+	chmod 755 `find $(STAGEDIR)$(DATADIR) -type d`
 
 uninstall:
 	rm -f $(CONFIGDIR)/bloboats.dirs