From 29d93f7d9d52cc44111ed9e10401979df1473eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Fri, 20 Sep 2013 18:37:15 +0200
Subject: [PATCH] separate Linux only shortcuts and icons from make install

---
 Makefile                        | 19 +++++++++++++------
 packaging/linux/buildpackage.sh |  8 +++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 5cd75c0976..8442ab00db 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@
 # to install with development tools, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install-all
 #
+# to install Linux desktop files and icons:
+#   make install-shortcuts
+#
 # to uninstall, run:
 #   make uninstall
 #
@@ -334,12 +337,6 @@ install-core: default
 	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
 	@-$(RM) openra
 
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
-
-	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
-	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
-
 install-tools: tools
 	@-echo "Installing OpenRA tools to $(DATA_INSTALL_DIR)"
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
@@ -355,6 +352,13 @@ install-tools: tools
 	@$(INSTALL_PROGRAM) -m +rx openra-editor "$(BIN_INSTALL_DIR)"
 	@-$(RM) openra-editor
 
+install-shortcuts: shortcuts
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
+	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
+
+	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
+
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
 
@@ -391,6 +395,9 @@ help:
 	@echo to install with development tools, run:
 	@echo \ \ make \[prefix=/foo\] \[bindir=/bar/bin\] install-all
 	@echo
+	@echo to install Linux desktop files and icons
+	@echo \ \ make install-shortcuts
+	@echo
 	@echo to uninstall, run:
 	@echo \ \ make uninstall
 	@echo
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index 87a34c2355..77354f4b55 100644
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -15,10 +15,16 @@ ROOTDIR=root
 # Clean up
 rm -rf $ROOTDIR
 
-# Copy files
 cd ../..
+# Copy files for OpenRA.Game.exe and OpenRA.Editor.exe as well as all dependencies.
 make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
+# Launch scripts (executed by Desura)
+cp *.sh "$PWD/packaging/linux/$ROOTDIR/usr/share/openra/" || exit 3
+
+# Icons and .desktop files
+make install-shortcuts
+
 cd packaging/linux
 
 (