From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 19 Mar 2016 05:09:17 +0000 (+1100)
Subject: Fix MSYS2 xonotic-data.pk3dir/qcsrc rebuild detection
X-Git-Tag: xonotic-v0.8.2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5c85d81e949435dcd8f683bfbcedb765d00c95d0;p=xonotic%2Fxonotic.git

Fix MSYS2 xonotic-data.pk3dir/qcsrc rebuild detection
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 6f66d62e..e1462c8b 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -249,11 +249,16 @@ case "$cmd" in
 			verbose make $MAKEFLAGS gmqcc
 		fi
 
+		if [ -n "$MSYSTEM" ]; then
+			DATAMAKE=mingw32-make
+		else
+			DATAMAKE=make
+		fi
 		verbose cd "$d0/data/xonotic-data.pk3dir"
 		if $cleanqc; then
-			verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
+			verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
 		fi
-		verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
+		verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"