improve mapinfo documentation

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 1f939e9e66fbee40e9d1716f9915fff87aa38d8e..bb0fa4833923a3cd08bd995cde7e5a42e2169db4 100755 (executable)
--- a/all
+++ b/all
@@ -398,7 +398,7 @@ case "$cmd" in
                        fi
                        rem=`git config "branch.$r.remote" || echo origin`
                        bra=`git config "branch.$r.merge" || echo "$r"`
-                       upstream="$rem/$bra"
+                       upstream="$rem/${bra#refs/heads/}"
                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                upstream="origin/`repobranch "$d"`"
                        fi
@@ -424,12 +424,16 @@ case "$cmd" in
                        if [ -z "$CC" ]; then
                                export CC=gcc
                        fi
-               elif [ x"`uname`" = x"Darwin" ] && [ x"`uname -r`" = x"10.3.0" ]; then
-                       TARGETS="sv-debug sdl-debug"
-                       # AGL is broken in Snow Leopard, so default to SDL.
-                       if  [ x"`uname -r`" != x"10.3.0" ]; then
-                               TARGETS="$TARGETS cl-debug"
-                       fi
+               elif [ x"`uname`" = x"Darwin" ]; then
+                       case "`uname -r`" in
+                               ?.*)
+                                       TARGETS="sv-debug cl-debug sdl-debug"
+                                       ;;
+                               *)
+                                       # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
+                                       TARGETS="sv-debug sdl-debug"
+                                       ;;
+                       esac
                        export CC="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
                        TARGETS="sv-debug cl-debug sdl-debug"