--- a/crawl-ref/crawl-tiles/Makefile.orig	2016-05-05 17:37:55.000000000 +0200
+++ b/crawl-ref/crawl-tiles/Makefile	2016-06-03 21:19:03.840066325 +0200
@@ -74,7 +74,7 @@
 #    them; you can also ask for a package with convenience libraries instead --
 #    we'll try to provide them somewhere in the near future.
 
-GAME = crawl
+GAME = crawl-tiles
 
 # Disable GNU Make implicit rules and variables. Leaving them enabled will slow
 # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have
@@ -111,7 +111,7 @@
 # Which C++ standard to support
 STDFLAG = -std=c++11
 
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(EXTERNAL_FLAGS)
 # Build with FORCE_SSE=y to get better seed stability on 32 bit x86 builds. It
 # is not recommended to do this unless you are building with contrib lua.
 # On any 64bit  builds where the arch supports it, (at least) sse2 is implied.
@@ -120,7 +120,7 @@
 endif
 
 CFWARN :=
-CFWARN_L := -Wall -Wformat-security -Wundef
+CFWARN_L := -Wundef
 
 # Exceptions:
 #  -Wmissing-field-initializers: need c++14 to set default struct fields
@@ -386,7 +386,7 @@
 ifneq ($(patsubst %/,%,$(prefix)),/usr)
 bin_prefix    := bin
 else
-bin_prefix    := games
+bin_prefix    := bin
 endif
 endif
 
@@ -398,6 +398,8 @@
 # SAVEDIR := saves/
 # DATADIR := data/
 ifneq (,$(FHS))
+LICENSEDIR    := share/licenses/crawl
+DOCDIR        := share/doc/crawl
 DATADIR       := share/crawl
 SAVEDIR       := ~/.crawl
 endif
@@ -506,7 +508,7 @@
     # subsequent point releases of 4.2.
     CFOPTIMIZE := -O0
   else
-    CFOPTIMIZE := -O2
+    CFOPTIMIZE :=
   endif
 endif
 
@@ -1442,9 +1444,8 @@
 	for LANG in $(LANGUAGES); \
 		do mkdir -p $(datadir_fp)/dat/descript/$$LANG; \
 	done
-	mkdir -p $(datadir_fp)/docs/develop
-	mkdir -p $(datadir_fp)/docs/develop/levels
-	mkdir -p $(datadir_fp)/docs/license
+	mkdir -p $(DESTDIR)$(prefix)/$(DOCDIR)/develop
+	mkdir -p $(DESTDIR)$(prefix)/$(DOCDIR)/develop/levels
 	mkdir -p $(datadir_fp)/settings
 	$(COPY_R) dat/des/* $(datadir_fp)/dat/des/
 	$(COPY_R) dat/dlua/* $(datadir_fp)/dat/dlua/
@@ -1474,12 +1475,11 @@
 	done
 	mkdir -p $(datadir_fp)/dat/dist_bones
 	$(COPY) dat/dist_bones/* $(datadir_fp)/dat/dist_bones/
-	$(COPY) ../docs/*.txt $(datadir_fp)/docs/
-	$(COPY) ../docs/*.md $(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/
+	$(COPY) ../docs/*.txt $(DESTDIR)$(prefix)/$(DOCDIR)/
+	$(COPY) ../docs/*.md $(DESTDIR)$(prefix)/$(DOCDIR)/
+	$(COPY) ../docs/develop/*.txt $(DESTDIR)$(prefix)/$(DOCDIR)/develop/
+	$(COPY) ../docs/develop/levels/*.txt $(DESTDIR)$(prefix)/$(DOCDIR)/develop/levels/
+	$(COPY) ../CREDITS.txt $(DESTDIR)$(prefix)/$(DOCDIR)/
 	$(COPY_R) ../settings/* $(datadir_fp)/settings/
 ifeq ($(GAME),crawl.exe)
 	$(SED) -i 's/$$/\r/' `find $(datadir_fp) -iname '*.txt' -or -iname '*.des'`
@@ -1514,7 +1514,6 @@
 install: all install-data
 	[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
 	$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
-	$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
 ifeq ($(USE_DGAMELAUNCH),)
 	$(CHOWN) $(INSTALL_UGRP) $(prefix_fp)/$(bin_prefix)/$(GAME) || true
 	$(CHMOD) $(MCHMOD) $(prefix_fp)/$(bin_prefix)/$(GAME) || true