From ddfa5a4d35f148ca43b7bca4a23daa22020e12fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 10 Jan 2021 19:15:23 +0100
Subject: [PATCH] Get rid of unnecessary Makefile variables.

---
 Makefile               |  9 +++------
 packaging/functions.sh | 10 ++++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ae571fd1b7..bf97f78b63 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,6 @@ bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/lib
 gameinstalldir ?= $(libdir)/openra
 
-DATA_INSTALL_DIR = $(DESTDIR)$(datadir)
-OPENRA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
-
 # Toolchain
 CWD = $(shell pwd)
 MSBUILD = msbuild -verbosity:m -nologo
@@ -121,14 +118,14 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
 	@sh -c '. ./packaging/functions.sh; set_mod_version $(VERSION) mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'
 
 install:
-	@sh -c '. ./packaging/functions.sh; install_assemblies_mono $(CWD) $(OPENRA_INSTALL_DIR) $(TARGETPLATFORM) True True True'
-	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(OPENRA_INSTALL_DIR) cnc d2k ra'
+	@sh -c '. ./packaging/functions.sh; install_assemblies_mono $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) True True True'
+	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(DESTDIR)$(gameinstalldir) cnc d2k ra'
 
 install-linux-shortcuts:
 	@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" $(VERSION) cnc d2k ra'
 
 install-linux-appdata:
-	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) $(DATA_INSTALL_DIR) cnc d2k ra'
+	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'
 
 help:
 	@echo 'to compile, run:'
diff --git a/packaging/functions.sh b/packaging/functions.sh
index 32a5ad443d..d496874c23 100755
--- a/packaging/functions.sh
+++ b/packaging/functions.sh
@@ -293,14 +293,16 @@ install_linux_shortcuts() {
 # Copy AppStream metadata to the target directory
 # Arguments:
 #   SRC_PATH: Path to the root OpenRA directory
+#   BUILD_PATH: Path to packaging filesystem root (e.g. /tmp/openra-build/ or "" for a local install)
 #   SHARE_PATH: Parent path to the appdata directory (e.g. /usr/local/share)
 #   MOD [MOD...]: One or more mod ids to copy (cnc, d2k, ra)
 # Used by:
 #   Makefile (install-linux-appdata target for local installs and downstream packaging)
 install_linux_appdata() {
 	SRC_PATH="${1}"
-	SHARE_PATH="${2}"
-	shift 2
+	BUILD_PATH="${2}"
+	SHARE_PATH="${3}"
+	shift 3
 	while [ -n "${1}" ]; do
 		MOD_ID="${1}"
 		SCREENSHOT_CNC=
@@ -323,10 +325,10 @@ install_linux_appdata() {
 			fi
 		fi
 
-		install -d "${SHARE_PATH}/appdata"
+		install -d "${BUILD_PATH}${SHARE_PATH}/appdata"
 
 		sed "s/{MODID}/${MOD_ID}/g" "${SRC_PATH}/packaging/linux/openra.appdata.xml.in" | sed "s/{MOD_NAME}/${MOD_NAME}/g" | sed "s/{SCREENSHOT_RA}/${SCREENSHOT_RA}/g" | sed "s/{SCREENSHOT_CNC}/${SCREENSHOT_CNC}/g" | sed "s/{SCREENSHOT_D2K}/${SCREENSHOT_D2K}/g"> "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml"
-		install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml" "${SHARE_PATH}/appdata"
+		install -m644 "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml" "${BUILD_PATH}${SHARE_PATH}/appdata"
 		rm "${SRC_PATH}/packaging/linux/openra-${MOD_ID}.appdata.xml"
 
 		shift