Index: source/Makefile
===================================================================
--- source/Makefile
+++ source/Makefile	2013-01-02 13:01:18.966033986 +0100
@@ -1227,8 +1227,8 @@
 	@exit 1
 endif
 	[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
-	$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
-	$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
+	$(COPY) $(GAME) $(DESTDIR)/$(BINDIR)/$(GAME)-$(DISPLAYTYPE)
+	$(STRIP) $(DESTDIR)/$(BINDIR)/$(GAME)-$(DISPLAYTYPE)
 	mkdir -p $(datadir_fp)/dat/des
 	mkdir -p $(datadir_fp)/dat/dlua
 	mkdir -p $(datadir_fp)/dat/clua
@@ -1236,9 +1236,9 @@
 	mkdir -p $(datadir_fp)/dat/database
 	mkdir -p $(datadir_fp)/dat/defaults
 	mkdir -p $(datadir_fp)/dat/descript
-	mkdir -p $(datadir_fp)/docs/develop
-	mkdir -p $(datadir_fp)/docs/develop/levels
-	mkdir -p $(datadir_fp)/docs/license
+	mkdir -p $(DESTDIR)/$(DOCDIR)/docs/develop
+	mkdir -p $(DESTDIR)/$(DOCDIR)/docs/develop/levels
+	mkdir -p $(DESTDIR)/$(DOCDIR)/docs/license
 	mkdir -p $(datadir_fp)/settings
 	$(COPY_R) dat/des/* $(datadir_fp)/dat/des/
 	$(COPY)   dat/dlua/*.lua $(datadir_fp)/dat/dlua/
@@ -1253,12 +1253,12 @@
 	$(COPY_R) dat/database/* $(datadir_fp)/dat/database/
 	$(COPY_R) dat/defaults/* $(datadir_fp)/dat/defaults/
 	$(COPY_R) dat/descript/* $(datadir_fp)/dat/descript/
-	$(COPY) ../docs/*.txt $(datadir_fp)/docs/
-	$(COPY) ../docs/develop/*.txt $(datadir_fp)/docs/develop/
-	$(COPY) ../docs/develop/levels/*.txt $(datadir_fp)/docs/develop/levels/
-	$(COPY) ../docs/license/*.txt $(datadir_fp)/docs/license/
-	$(COPY) ../CREDITS.txt $(datadir_fp)/docs/
-	util/columnise-credits.pl $(datadir_fp)/docs/CREDITS.txt
+	$(COPY) ../docs/*.txt $(DESTDIR)/$(DOCDIR)/docs/
+	$(COPY) ../docs/develop/*.txt $(DESTDIR)/$(DOCDIR)/docs/develop/
+	$(COPY) ../docs/develop/levels/*.txt $(DESTDIR)/$(DOCDIR)/docs/develop/levels/
+	$(COPY) ../docs/license/*.txt $(DESTDIR)/$(DOCDIR)/docs/license/
+	$(COPY) ../CREDITS.txt $(DESTDIR)/$(DOCDIR)/docs/
+	util/columnise-credits.pl $(DESTDIR)/$(DOCDIR)/docs/CREDITS.txt
 	$(COPY) ../settings/* $(datadir_fp)/settings/
 ifeq ($(GAME),crawl.exe)
 	sed -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -o -iname '*.des'`