get progs.dat from the right place

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 50904c9d356caba8e43b748139f7d255029606d8..1edecb2990bdba30b6b2c02b7380e6df3e70a870 100755 (executable)
--- a/all
+++ b/all
@@ -988,10 +988,10 @@ case "$cmd" in
        release-qc)
                case "$RELEASETYPE" in
                        beta)
-                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= clean all
+                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                                ;;
                        release)
-                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= clean all
+                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
                                ;;
                esac
                verbose rm -f Xonotic/source/*/fteqcc.log
@@ -1067,9 +1067,9 @@ case "$cmd" in
                }
                verbose cd Xonotic/temp
                if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
-                       verbose cp ../progs.dat .
-                       verbose cp ../csprogs.dat .
-                       verbose cp ../menu.dat .
+                       verbose cp ../source/progs.dat .
+                       verbose cp ../source/csprogs.dat .
+                       verbose cp ../source/menu.dat .
                        verbose rm -rf qcsrc
                        gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
                        major=$(($gv / 10000))
@@ -1133,7 +1133,7 @@ case "$cmd" in
                stamp=`cat Xonotic/stamp.txt`
                verbose zip -9yr Xonotic-common.zip \
                        Xonotic/*.dll \
-                       Xonotic/source \
+                       Xonotic/source/*/ \
                        Xonotic/Docs \
                        Xonotic/misc \
                        Xonotic/fteqcc \