Fixed FreeBSD bugs.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@369 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/.Makefile.inc b/.Makefile.inc
index 6899d35d89ce5c141dc6c27d361fd6a62b8223d9..83ea71fcfbb163a7e22ee4ed82ae59c8187dde60 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -10,6 +10,7 @@ echo "# Small modifications by <brain@ChatSpike.net>" >> Makefile
 echo "#" >>Makefile
 echo ""
 echo "CC = g++" >> Makefile
+echo "MAKE = $MAKEPROG" >> Makefile
 echo "PROGS = inspircd" >> Makefile
 echo "FLAGS = $FLAGS" >> Makefile
 echo "LDLIBS = $LDLIBS" >> Makefile
@@ -22,11 +23,11 @@ echo "" >> Makefile
 echo "all : ircd mods config" >> Makefile
 echo "" >> Makefile
 echo "mods:" >> Makefile
-echo " make -C src/modules DIRNAME="src/modules" \$(MAKEARGS)" >> Makefile
+echo " \${MAKE} -C src/modules DIRNAME="src/modules" \$(MAKEARGS)" >> Makefile
 echo " mv src/modules/*.so \$(MODPATH)" >> Makefile
 echo "" >> Makefile
 echo "ircd:" >> Makefile
-echo " make -C src DIRNAME="src" \$(MAKEARGS)" >> Makefile
+echo " \${MAKE} -C src DIRNAME="src" \$(MAKEARGS)" >> Makefile
 echo " cp src/inspircd \$(BINPATH)" >> Makefile
 echo "" >> Makefile
 echo "config:" >> Makefile

diff --git a/configure b/configure
index f15498b9ede0ab0df2626804fbddce7b793500b4..ae676d17e1ffecddc375a1f711d9d09020102b7c 100755 (executable)
--- a/configure
+++ b/configure
@@ -368,10 +368,12 @@ case "$OSNAME" in
        (FreeBSD)
                LDLIBS="-Ldl"
                FLAGS="-fPIC -frtti -O3"
+               MAKEPROG="gmake"
                ;;
        (*)
                LDLIBS="-ldl"
                FLAGS="-fPIC -frtti -O3"
+               MAKEPROG="make"
                ;;
 esac
 
@@ -397,7 +399,7 @@ if [ "$YN" != "n" ] ; then
        echo -e "\033[1;32mCompiling...\033[0;37m"
        echo ""
        cd $ME
-       make
+       `$MAKEPROG`
        echo ""
         echo "Done!"
         echo ""