Merge branch 'devnexen/bsd' into 'master'

possiblity to compile the project using BSD with GNUmake

modified:   misc/tools/all/xonotic.subr

See merge request !16

diff --git a/all b/all
index 7d54d00cae2823eda957da69789660020f2d8dd8..a6e8ebb0372a24e3d3814c071eee6557507bf7d5 100755 (executable)
--- a/all
+++ b/all
@@ -19,15 +19,20 @@ 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}
+               ;;
+       *)
                $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:

diff --git a/data/font-xolonium.pk3dir/fonts/README b/data/font-xolonium.pk3dir/fonts/README
index bdf9aaf106f4b1e8d4df4559146cda21a7c93565..2fff41d242b9ecd0a762a2c9713bf5273609de36 100755 (executable)
--- a/data/font-xolonium.pk3dir/fonts/README
+++ b/data/font-xolonium.pk3dir/fonts/README
@@ -1,9 +1,9 @@
-Copyright 2011-2015 Severin Meyer <sev.ch@web.de>
+Copyright 2011-2016 Severin Meyer <sev.ch@web.de>
 
 
 This is a special GPL version of the Xolonium font,
 intended for Xonotic. Find the public release at
-<http://openfontlibrary.org/font/xolonium>
+<http://fontlibrary.org/font/xolonium>
 
 
 This font is free software. You can redistribute and/or

diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf
index 2676016806c1cf0ddceae99b80cf1ea4d92f9224..cdcbb2870a1860999553482ef5b7e871fc419f8e 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf differ

diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf
index 18b1c5e9e45427d947f389c4277908e2d3d6c543..0d22516e19fd2f6d1106636e6505f8e68befe03e 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf differ