support the US mirror

[xonotic/xonotic.git] / all

diff --git a/all b/all
index df9bd21e9df69d3e18e26e0378db5c13e520273b..f584ede593a5ffd9960bc3152758c4aea88e9298 100755 (executable)
--- a/all
+++ b/all
@@ -489,6 +489,7 @@ case "$cmd" in
                                case "$2" in
                                        nl) ;;
                                        de) ;;
+                                       us) ;;
                                        best) ;;
                                        default) ;;
                                        *)
@@ -496,6 +497,7 @@ case "$cmd" in
                                                msg "Possible locations for the -l option:"
                                                msg "  nl (Netherlands, run by merlijn)"
                                                msg "  de (Germany, run by divVerent)"
+                                               msg "  us (United States of America, run by detrate)"
                                                msg "  best (find automatically)"
                                                msg "  default (currently nl)"
                                                exit 1
@@ -514,7 +516,7 @@ case "$cmd" in
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)
-                                               if location=`bestmirror $newbase"xonotic.git" de nl`; then
+                                               if location=`bestmirror $newbase"xonotic.git" de nl us`; then
                                                        :
                                                else
                                                        location=current
@@ -908,7 +910,7 @@ case "$cmd" in
                                                                #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
                                                                #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/
                                                                #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
-                                                               MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/"
+                                                               MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/"
                                                                ;;
                                                        *)
                                                                compiled0=true
@@ -1010,9 +1012,9 @@ case "$cmd" in
 
                binary=$1
 
-               if [ -n "$USE_GDB" ]; then
+               if [ x"$USE_GDB" = x"yes" ]; then
                        set -- gdb --args "$@"
-               elif which gdb >/dev/null 2>&1; then
+               elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
                        set -- gdb --batch -x savecore.gdb --args "$@"
                elif which catchsegv >/dev/null 2>&1; then
                        set -- catchsegv "$@"