Merge branch 'master' into master-merge

diff --git a/library-bundler b/library-bundler
index 54056c41fe527b803fc399d9ab42898931bcf1ee..e9a7ccddf12d1eef487ed2cb93015a2ea0eb7310 100755 (executable)
--- a/library-bundler
+++ b/library-bundler
@@ -105,7 +105,7 @@ Multi::excludeLdd () {
                                        Common::noOp
                                # FreeBSD specific
                                elif echo "${ldd_line}" \
-                                       | egrep -q '/libc++|/libgxxrt'
+                                       | egrep -q '/libc\+\+|/libgxxrt'
                                then
                                        Common::noOp
                                else
@@ -176,17 +176,17 @@ Multi::getRootPrefix () {
        local lib_file="${1}"
 
        case "${system_name}" in
-               'linux'|'freebsd')
-                       echo "${lib_file}" \
-                       | cut -f2 -d'/'
+               'linux')
+                       echo 'usr'
+                       ;;
+               'freebsd'|'macos')
+                       echo 'usr/local'
                        ;;
                'windows')
                        basename "${lib_file}" \
                        | xargs -n1 -P1 which \
                        | cut -f2 -d'/'
                        ;;
-               'macos')
-                       echo 'usr/local'
        esac
 }
 

diff --git a/tools/quake2/qdata/qdata.c b/tools/quake2/qdata/qdata.c
index 1d9f6c78d48c650816a798d2581a674b81660ad1..7b551cbf31faf91185fe034d9b272967ddd90208 100644 (file)
--- a/tools/quake2/qdata/qdata.c
+++ b/tools/quake2/qdata/qdata.c
@@ -245,7 +245,8 @@ void PackDirectory_r( char *dir ){
 #else
 
 #include <sys/types.h>
-#include <sys/dir.h>
+
+#include <dirent.h>
 
 void PackDirectory_r( char *dir ){
 #ifdef NeXT

diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c
index 3f74d27f44a96ec98070f293a42069bcf4740b45..39b2e49765e77416a5e6ae5b4a32e09ae5aa05a4 100644 (file)
--- a/tools/quake3/q3data/q3data.c
+++ b/tools/quake3/q3data/q3data.c
@@ -335,11 +335,8 @@ void PackDirectory_r( char *dir ){
 #else
 
 #include <sys/types.h>
-#if !GDEF_OS_WINDOWS
-#include <sys/dir.h>
-#else
-#include <sys/dirent.h>
-#endif
+
+#include <dirent.h>
 
 void PackDirectory_r( char *dir ){
 #ifdef NeXT

diff --git a/tools/unvanquished/daemonmap b/tools/unvanquished/daemonmap
index 18be9d84e42c21da6876f7dffa1d25f28e383360..f063894efd86504c9d9fa3e248ee1c95395f7951 160000 (submodule)
--- a/tools/unvanquished/daemonmap
+++ b/tools/unvanquished/daemonmap
@@ -1 +1 @@
-Subproject commit 18be9d84e42c21da6876f7dffa1d25f28e383360
+Subproject commit f063894efd86504c9d9fa3e248ee1c95395f7951