Fix to Bugs #10 and #11

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index f15498b9ede0ab0df2626804fbddce7b793500b4..eccddf5fd4b935d974da1b197e1fdd25ed5150e6 100755 (executable)
--- a/configure
+++ b/configure
@@ -364,14 +364,21 @@ touch include/inspircd_config.h
 
 echo "Preparing Variables for the Makefile"
 
+if [ "$CONFIG_DIR" != "$ME/conf" ] ; then
+    COPY_CONF=1
+fi
+
+
 case "$OSNAME" in
        (FreeBSD)
                LDLIBS="-Ldl"
                FLAGS="-fPIC -frtti -O3"
+               MAKEPROG="gmake"
                ;;
        (*)
                LDLIBS="-ldl"
                FLAGS="-fPIC -frtti -O3"
+               MAKEPROG="make"
                ;;
 esac
 
@@ -397,7 +404,7 @@ if [ "$YN" != "n" ] ; then
        echo -e "\033[1;32mCompiling...\033[0;37m"
        echo ""
        cd $ME
-       make
+       $MAKEPROG
        echo ""
         echo "Done!"
         echo ""