diff options
| author | frostycoolslug <frostycoolslug@e03df62e-2008-0410-955e-edbf42e46eb7> | 2004-04-03 22:26:25 +0000 |
|---|---|---|
| committer | frostycoolslug <frostycoolslug@e03df62e-2008-0410-955e-edbf42e46eb7> | 2004-04-03 22:26:25 +0000 |
| commit | 5f30e68a76f0b4e71884675adb59c931bdb19fb8 (patch) | |
| tree | b8d193c376d4cca79fc1319bea3db7a35a313e2f | |
| parent | f82f00034a60281cc63b2fecec15f87084af2a68 (diff) | |
Fixed FreeBSD bugs.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@369 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | .Makefile.inc | 5 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.Makefile.inc b/.Makefile.inc index 6899d35d8..83ea71fcf 100644 --- 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 @@ -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 "" |