Merge branch 'master' of /var/cache/git/xonotic/xonotic

[xonotic/xonotic.git] / all

diff --git a/all b/all
index d517457b05dc6b3750e92a9ef51d4961f418a1de..b451ac7d26f29254f61b9fddf260ce1511fe592b 100755 (executable)
--- a/all
+++ b/all
@@ -1198,7 +1198,7 @@ case "$cmd" in
 
                if [ x"$USE_GDB" = x"yes" ]; then
                        set -- gdb --args "$@"
-               elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
+               elif [ x"$USE_GDB" = x"core" ] && which gdb >/dev/null 2>&1; then
                        set -- gdb --batch -x savecore.gdb --args "$@"
                elif which catchsegv >/dev/null 2>&1; then
                        set -- catchsegv "$@"
@@ -1788,7 +1788,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+               verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)