From 48b03577e95b088c5dec91aa58c5fb008a836509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Nov 2013 16:22:03 +0100
Subject: [PATCH 1/2] one / too much in the end

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 678ef430f9..60685d8690 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ install-core: default
 	@echo "#!/bin/sh" 				>  openra
 	@echo 'BINDIR=$$(dirname $$(readlink -f $$0))'	>> openra
 	@echo 'ROOTDIR="$${BINDIR%'"$(bindir)"'}"' 	>> openra
-	@echo 'DATADIR="$${ROOTDIR}/'"$(datadir)"'"'	>> openra
+	@echo 'DATADIR="$${ROOTDIR}'"$(datadir)"'"'	>> openra
 	@echo 'cd "$${DATADIR}/openra"' 		>> openra
 	@echo 'exec mono OpenRA.Game.exe "$$@"' 	>> openra
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"

From ff8a4a7f90762718dcee8c37b82b1295f8a9d105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 2 Nov 2013 16:22:47 +0100
Subject: [PATCH 2/2] correct the bindir for Debian launcher scripts

fixes #4048
---
 packaging/linux/deb/buildpackage.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index 81d9343cba..7475e4fb7d 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -21,6 +21,10 @@ cp -R $rootdir/usr root
 
 # Binaries go in /usr/games
 mv root/usr/bin/ root/usr/games/
+sed "s/\/usr\/bin\//\/usr\/games\//" root/usr/games/openra > temp
+mv temp root/usr/games/openra
+sed "s/\/usr\/bin\//\/usr\/games\//" root/usr/games/openra-editor > temp
+mv temp root/usr/games/openra-editor
 
 # Put the copyright and changelog in /usr/share/doc/openra/
 mkdir -p root/usr/share/doc/openra/