From fe859c6fef0dce23c9546c489cd1c30c7d6aacf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 31 May 2014 09:51:44 +0200
Subject: [PATCH] rename everything freedesktop.org related install-linux-*

---
 Makefile                        | 18 +++++++++---------
 packaging/linux/buildpackage.sh |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 461f968fbf..be6e20e23f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@
 # to install with development tools, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install-all
 #
-# to install Linux desktop files and icons:
-#   make install-startup-scripts
+# to install Linux startup scripts, desktop files and icons:
+#   make install-linux-shortcuts
 #
 # to uninstall, run:
 #   make uninstall
@@ -296,9 +296,9 @@ docs: utility
 
 install: install-core
 
-install-all: install-core install-tools install-startup-scripts
+install-all: install-core install-tools
 
-install-shortcuts: install-icons install-desktop
+install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
 install-core: default
 	@-echo "Installing OpenRA to $(DATA_INSTALL_DIR)"
@@ -345,16 +345,16 @@ install-tools: tools
 	@$(INSTALL_DIR) "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) $(foreach prog,$(TOOLS),$($(prog)_TARGET)) "$(DATA_INSTALL_DIR)"
 
-install-icons:
+install-linux-icons:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/"
 	@$(CP_R) packaging/linux/hicolor/ "$(DESTDIR)$(datadir)/icons"
 
-install-desktop:
+install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-editor.desktop "$(DESTDIR)$(datadir)/applications"
 
-install-startup-scripts:
+install-linux-scripts:
 	@echo "#!/bin/sh" > openra
 	@echo 'cd "$(gameinstalldir)"' >> openra
 	@echo 'exec mono OpenRA.Game.exe "$$@"' >> openra
@@ -402,8 +402,8 @@ 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-startup-scripts
+	@echo to install Linux startup scripts, desktop files and icons
+	@echo \ \ make install-linux-shortcuts
 	@echo
 	@echo to uninstall, run:
 	@echo \ \ make uninstall
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index 870949f36f..90d910bd0b 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -23,8 +23,8 @@ make install-all prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
 cp $DEPSDIR/* $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/
 
-# Icons and .desktop files
-make install-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
+# Install startup scripts, desktop files and icons
+make install-linux-shortcuts prefix="/usr" DESTDIR="$PWD/packaging/linux/$ROOTDIR"
 
 # Remove the WinForms dialog which is replaced with a native one provided by zenity
 rm $PWD/packaging/linux/$ROOTDIR/usr/lib/openra/OpenRA.CrashDialog.exe