Merge branch 'asciiwolf/xonotic-makefile-fix'

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 7d54d00cae2823eda957da69789660020f2d8dd8..ca2a093cc9706400f1baf6a10bd3da1467116ed7 100755 (executable)
--- a/all
+++ b/all
@@ -19,15 +19,22 @@ LF="
 ESC="\e"
 
 d00=`pwd`
-while ! [ -f ./all ]; do
-       if [ x"`pwd`" = x"/" ]; then
+case "$0" in
+       /*/all)
+               export d0="${0%/all}"
+               ;;
+       */all)
+               export d0="$d00/${0%/all}"
+               ;;
+       */all.xonotic.sh)
+               ;;
+       *)
                $ECHO "Cannot find myself."
                $ECHO "Please run this script with the working directory inside a Xonotic checkout."
-               exit 1
-       fi
-       cd ..
-done
-export d0=`pwd`
+               ;;
+esac
+cd "$d0"
+d0=`pwd`
 SELF="$d0/all"
 
 # If we are on WINDOWS: