It says something about how excessive our debug output is when the ssl modules have...

[user/henk/code/inspircd.git] / .Makefile.inc

diff --git a/.Makefile.inc b/.Makefile.inc
index 155bc36fb6f60fb56a9699ac6e0cc89014eac435..26de1f83c3839d74d1d68dd887155bca3e57cfdf 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -12,15 +12,15 @@ MAKE = @MAKEPROG@
 PROGS = inspircd
 FLAGS = @FLAGS@
 LDLIBS = @LDLIBS@
-BASE = @BASE_DIR@
-CONPATH = @CONFIG_DIR@
-MODPATH = @MODULE_DIR@
-BINPATH = @BINARY_DIR@
-LIBPATH = @LIBRARY_DIR@
+BASE = $(DESTDIR)@BASE_DIR@
+CONPATH = $(DESTDIR)@CONFIG_DIR@
+MODPATH = $(DESTDIR)@MODULE_DIR@
+BINPATH = $(DESTDIR)@BINARY_DIR@
+LIBPATH = $(DESTDIR)@LIBRARY_DIR@
 MODULES = @MODULES@
 STATICLIBS = @STATICLIBS@
 INSTMODE = 0700
-MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'STATICLIBS=${STATICLIBS}'
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'STATICLIBS=${STATICLIBS}' 'INSTMODE=${INSTMODE}'
 
 all : @MAKEORDER@ finishmessage
 
@@ -33,20 +33,28 @@ finishmessage: ircd mods
        @echo ""
        @echo "*************************************"
        @echo "*        BUILD COMPLETE!            *"
+       @echo "*                                   *"
        @echo "*   To install InspIRCd, type:      *"
        @echo "*         make install              *"
        @echo "*************************************"
 
 ircd:
-       @echo "Making ircd..."
+       @echo "*************************************"
+       @echo "*       BUILDING INSPIRCD           *"
+       @echo "*                                   *"
+       @echo "*   This will take a *long* time.   *"
+       @echo "*     Why not read our wiki at      *"
+       @echo "*   http://www.inspircd.org/wiki    *"
+       @echo "*  while you wait for make to run?  *"
+       @echo "*************************************"
        ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 install: all
-       @-mkdir -p ${BASE}
-       @-mkdir -p $(LIBPATH)
-       @-mkdir -p $(BINPATH)
-       @-mkdir -p $(CONPATH)
-       @-mkdir -p ${MODPATH}
+       @-install -d -m $(INSTMODE) ${BASE}
+       @-install -d -m $(INSTMODE) $(LIBPATH)
+       @-install -d -m $(INSTMODE) $(BINPATH)
+       @-install -d -m $(INSTMODE) $(CONPATH)
+       @-install -d -m $(INSTMODE) ${MODPATH}
        -install -m $(INSTMODE) src/libIRCDasyncdns.so $(LIBPATH)
        -install -m $(INSTMODE) src/libIRCDbase.so $(LIBPATH)
        -install -m $(INSTMODE) src/libIRCDchannels.so $(LIBPATH)
@@ -73,6 +81,7 @@ install: all
        -install -m $(INSTMODE) inspircd $(BASE) 2>/dev/null
        -install -m $(INSTMODE) src/cmd_admin.so $(LIBPATH)
        -install -m $(INSTMODE) src/cmd_away.so $(LIBPATH)
+       -install -m $(INSTMODE) src/cmd_clearcache.so $(LIBPATH)
        -install -m $(INSTMODE) src/cmd_commands.so $(LIBPATH)
        -install -m $(INSTMODE) src/cmd_connect.so $(LIBPATH)
        -install -m $(INSTMODE) src/cmd_die.so $(LIBPATH)
@@ -139,8 +148,9 @@ install: all
        @echo ""
        @echo "*************************************"
        @echo "*        INSTALL COMPLETE!          *"
+       @echo "*                                   *"
        @echo "* It is safe to ignore any messages *"
-       @echo "* related to copying of files.      *"
+       @echo "* related to copying of conf files. *"
        @echo "*                                   *"
        @echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
        @echo "*************************************"
@@ -154,6 +164,8 @@ modclean:
        rm -rf modules/*.so
        rm -rf src/modules/*.so
        rm -rf src/modules/*.o
+       rm -rf lib/*.so
+       rm -f bin/inspircd
 
 squeakyclean: distclean