From 817db8dbe034dc510fbf29508c53409e1dae0241 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 16 Mar 2019 14:20:11 +0000
Subject: [PATCH] Fix build artifacts leaking between platforms.

This moves the `dependencies` target from `core`
to `default`, so that we aren't forced to run
`linux-dependencies` for non-linux platforms.
---
 Makefile                          | 4 ++--
 packaging/linux/buildpackage.sh   | 7 ++++++-
 packaging/osx/buildpackage.sh     | 1 +
 packaging/windows/buildpackage.sh | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 474c2c0f99..fc3292095c 100644
--- a/Makefile
+++ b/Makefile
@@ -295,9 +295,9 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 
 ########################## MAKE/INSTALL RULES ##########################
 #
-default: core
+default: dependencies core
 
-core: dependencies game platforms mods utility server
+core: game platforms mods utility server
 
 mods: mod_common mod_cnc mod_d2k
 
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index b537110e0d..4ef2977ead 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -45,8 +45,13 @@ fi
 echo "Building core files"
 
 pushd "${SRCDIR}" > /dev/null || exit 1
-make linux-dependencies
+
+make clean
+
+# linux-dependencies target will trigger the lua detection script, which we don't want during packaging
+make cli-dependencies geoip-dependencies
 sed "s/@LIBLUA51@/liblua5.1.so.0/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
+
 make core SDK="-sdk:4.5"
 make version VERSION="${TAG}"
 make install-engine prefix="usr" DESTDIR="${BUILTDIR}/"
diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index 90dc9afb0f..35bd52612d 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -71,6 +71,7 @@ modify_plist "{FAQ_URL}" "http://wiki.openra.net/FAQ" "${BUILTDIR}/OpenRA.app/Co
 echo "Building core files"
 
 pushd "${SRCDIR}" > /dev/null || exit 1
+make clean
 make osx-dependencies
 make core SDK="-sdk:4.5"
 make version VERSION="${TAG}"
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index fa195210e1..0a7f93ee43 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -38,6 +38,7 @@ function makelauncher()
 echo "Building core files"
 
 pushd "${SRCDIR}" > /dev/null || exit 1
+make clean
 make windows-dependencies
 make core SDK="-sdk:4.5"
 make version VERSION="${TAG}"