--- Makefile.orig	2012-08-30 23:59:06.000000000 -0600
+++ Makefile	2012-12-24 13:15:46.139736132 -0700
@@ -1,9 +1,10 @@
 APPNAME=redeclipse
+VERSION=@VERSION@
 APPCLIENT=reclient
 APPSERVER=reserver
 
 #CXXFLAGS= -ggdb3
-CXXFLAGS= -O3 -fomit-frame-pointer
+CXXFLAGS= $(EXTRA_CXXFLAGS) -fomit-frame-pointer
 override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
 
 PLATFORM= $(shell uname -s)
--- system-install.mk.orig	2012-08-13 04:51:04.000000000 -0600
+++ system-install.mk	2012-12-24 13:39:56.896599172 -0700
@@ -3,15 +3,15 @@
 cappname=$(shell echo $(appname) | tr '[:lower:]' '[:upper:]')# Captial appname
 appclient=$(APPCLIENT)
 appserver=$(APPSERVER)
-prefix=/usr/local
+prefix=/usr
 games=
 gamesbin=/bin
 bindir=$(DESTDIR)$(prefix)/bin
 gamesbindir=$(DESTDIR)$(prefix)$(gamesbin)
-libexecdir=$(DESTDIR)$(prefix)/lib$(games)
-datadir=$(DESTDIR)$(prefix)/share$(games)
-docdir=$(DESTDIR)$(prefix)/share/doc
-mandir=$(DESTDIR)$(prefix)/share/man
+libexecdir=$(DESTDIR)$(prefix)/libexec
+datadir=$(DESTDIR)$(prefix)/share/games/$(appname)
+docdir=$(DESTDIR)$(prefix)/doc/$(appname)-$(VERSION)
+mandir=$(DESTDIR)$(prefix)/man
 menudir=$(DESTDIR)$(prefix)/share/applications
 icondir=$(DESTDIR)$(prefix)/share/icons/hicolor
 pixmapdir=$(DESTDIR)$(prefix)/share/pixmaps
@@ -45,55 +45,55 @@
 icons: $(ICONS)
 
 system-install-client: client
-	install -d $(libexecdir)/$(appname)
+	install -d $(libexecdir)
 	install -d $(gamesbindir)
-	install -m755 $(appclient) $(libexecdir)/$(appname)/$(appname)
+	install -m755 $(appclient) $(libexecdir)/$(appname)
 	install -m755 install/nix/$(appsrcname).am \
 		$(gamesbindir)/$(appname)
-	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
+		-e 's,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
 		-e 's,@APPNAME@,$(appname),g' \
 		-i $(gamesbindir)/$(appname)
-	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/data \
-		$(libexecdir)/$(appname)/data
+	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/data \
+		$(libexecdir)/data
 
 system-install-server: server
-	install -d $(libexecdir)/$(appname)
+	install -d $(libexecdir)
 	install -d $(gamesbindir)
 	install -m755 $(appserver) \
-		$(libexecdir)/$(appname)/$(appname)-server
+		$(libexecdir)/$(appname)-server
 	install -m755 install/nix/$(appsrcname)-server.am \
 		$(gamesbindir)/$(appname)-server
-	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
+		-e 's,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
 		-e 's,@APPNAME@,$(appname),g' \
 		-i $(gamesbindir)/$(appname)-server
 
 system-install-data:
-	install -d $(datadir)/$(appname)
-	cp -r ../data $(datadir)/$(appname)/data
+	install -d $(datadir)
+	cp -r ../data $(datadir)/data
 
 system-install-docs: $(MANPAGES)
 	install	-d $(mandir)/man6
-	install -d $(docdir)/$(appname)
-	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
+	install -d $(docdir)
+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
+		-e 's,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
 		-e 's,@APPNAME@,$(appname),g' \
 		-e 's,@CAPPNAME@,$(cappname),g' \
 		../doc/man/$(appsrcname).6.am | \
 		gzip -9 -n -c > $(mandir)/man6/$(appname).6.gz
-	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
+		-e 's,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
 		-e 's,@APPNAME@,$(appname),g' \
 		-e 's,@CAPPNAME@,$(cappname),g' \
 		../doc/man/$(appsrcname)-server.6.am | \
 		gzip -9 -n -c > $(mandir)/man6/$(appname)-server.6.gz
-	cp -r ../doc/examples $(docdir)/$(appname)/examples
-	cp ../doc/guidelines.txt $(docdir)/$(appname)/guidelines.txt
+	cp -r ../doc/examples $(docdir)/examples
+	cp ../doc/guidelines.txt $(docdir)/guidelines.txt
 
 system-install-menus: icons
 	install -d $(menudir)
@@ -103,9 +103,9 @@
 	install -d $(icondir)/64x64/apps
 	install -d $(icondir)/128x128/apps
 	install -d $(pixmapdir)
-	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
 		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
 		-e 's,@APPNAME@,$(appname),g' \
 		install/nix/$(appsrcname).desktop.am > \
 		$(menudir)/$(appname).desktop