possiblity to compile the project using BSD with GNUmake
authorDavid Carlier <devnexen@gmail.com>
Sun, 17 Jul 2016 18:23:38 +0000 (19:23 +0100)
committerDavid Carlier <devnexen@gmail.com>
Sun, 17 Jul 2016 18:23:38 +0000 (19:23 +0100)
modified:   misc/tools/all/xonotic.subr

misc/tools/all/git.subr
misc/tools/all/xonotic.subr

index b14a8b6f1acd8e0f67443f7a211fcdf3c80fa3af..33054119e013680b08db65b02719556a3058f651 100644 (file)
@@ -19,10 +19,6 @@ initrepo()
        base=
        pushbase=
        allrepos initrepo_ "`git config remote.origin.url`" "`git config remote.origin.pushurl`"
-       if [ -z "$base" ]; then
-               msg "The main repo is not xonotic.git, what have you done?"
-               exit 1
-       fi
        msg "Found main repo = $base"
        if [ -n "$pushbase" ]; then
                msg "Found push repo = $pushbase"
index e1462c8bf9a4091a10f3ef008344c493e455c6b5..317946aa7226013e2df2bdddc725442be486ed29 100644 (file)
@@ -119,6 +119,10 @@ case "$cmd" in
                        fi
                fi
 
+               if [ -z "$MAKE" ]; then
+                       MAKE=make
+               fi
+
                if [ -z "$MAKEFLAGS" ]; then
                        ncpus=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`
                        if [ $ncpus -gt 1 ]; then
@@ -229,30 +233,30 @@ case "$cmd" in
                if $compiled0; then
                        if $cleand0; then
                                if [ -f Makefile ]; then
-                                       verbose make $MAKEFLAGS distclean
+                                       verbose $MAKE $MAKEFLAGS distclean
                                fi
                        fi
                        if ! [ -f Makefile ]; then
                                verbose sh autogen.sh
                                verbose ./configure
                        fi
-                       verbose make $MAKEFLAGS
+                       verbose $MAKE $MAKEFLAGS
                fi
 
                verbose cd "$d0/gmqcc"
                if $cleanqcc; then
-                       verbose make $MAKEFLAGS clean
+                       verbose $MAKE $MAKEFLAGS clean
                fi
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       verbose make $MAKEFLAGS gmqcc.exe
+                       verbose $MAKE $MAKEFLAGS gmqcc.exe
                else
-                       verbose make $MAKEFLAGS gmqcc
+                       verbose $MAKE $MAKEFLAGS gmqcc
                fi
 
                if [ -n "$MSYSTEM" ]; then
                        DATAMAKE=mingw32-make
                else
-                       DATAMAKE=make
+                       DATAMAKE=$MAKE
                fi
                verbose cd "$d0/data/xonotic-data.pk3dir"
                if $cleanqc; then
@@ -266,10 +270,10 @@ case "$cmd" in
                        $ECHO "Warning: invalid empty client, default clients will be used."
                fi
                if $cleandp; then
-                       verbose make $MAKEFLAGS clean
+                       verbose $MAKE $MAKEFLAGS clean
                fi
                for T in $TARGETS; do
-                       verbose make $MAKEFLAGS STRIP=: "$@" "$T"
+                       verbose $MAKE $MAKEFLAGS STRIP=: "$@" "$T"
                done
                for T in $BAD_TARGETS; do
                        $ECHO "Warning: discarded invalid client $T."