Fix MSYS2 xonotic-data.pk3dir/qcsrc rebuild detection

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 6f66d62e76048a755f8ca3afe7e8e4ac1e08311f..e1462c8bf9a4091a10f3ef008344c493e455c6b5 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -249,11 +249,16 @@ case "$cmd" in
                        verbose make $MAKEFLAGS gmqcc
                fi
 
                        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 cd "$d0/data/xonotic-data.pk3dir"
                if $cleanqc; then

-                       verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean
+                       verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean

                fi
                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"
                # 4 levels up: data, xonotic-data, qcsrc, server
 
                verbose cd "$d0/darkplaces"