Fixed to allow remote users to be put on a cull list

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

diff --git a/.Makefile.inc b/.Makefile.inc
index 4485ef78f794b17b1eca6ffd0dc3e1a9e587ebec..360ea6a6f56742a63e58ed0e539c54a0e1a5b6d6 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -7,18 +7,21 @@
 # Small modifications by <brain@ChatSpike.net>
 #
 
-CC = g++
+CC = @CC@
 MAKE = @MAKEPROG@
 PROGS = inspircd
 FLAGS = @FLAGS@
 LDLIBS = @LDLIBS@
+BASE = @BASE_DIR@
 CONPATH = @CONFIG_DIR@
 MODPATH = @MODULE_DIR@
 BINPATH = @BINARY_DIR@
+LIBPATH = @LIBRARY_DIR@
 MODULES = @MODULES@
-MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=$(MODPATH)'
+STATICLIBS = @STATICLIBS@
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=${MODPATH}' 'LIBPATH=${LIBPATH}' 'STATICLIBS=${STATICLIBS}'
 
-all : ircd mods config bininst
+all : @MAKEORDER@
 
 mods:
        ${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
@@ -27,8 +30,13 @@ ircd:
        ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 bininst:
-       @-cp src/*.so $(BINPATH)
+       @-rm -f $(BINPATH)/*.so
+       @-rm -f $(BINPATH)/inspircd
+       @-cp src/*.so $(LIBPATH)
        @-cp src/inspircd $(BINPATH)
+       @-cp inspircd $(BASE)
+       @-chmod 0700 $(BINPATH)/inspircd
+       @-chmod 0700 $(LIBPATH)/*.so
 
 config:
        @cp conf/inspire.motd $(CONPATH)/inspire.motd.example
@@ -36,12 +44,13 @@ config:
        @cp conf/inspire.rules $(CONPATH)/inspire.rules.example
        @cp docs/*.example $(CONPATH)
 clean:
-       rm -rf src/*.so
-       rm -rf src/inspircd
-       rm -rf src/modules/*.so
+       @echo Cleaning...
+       @rm -rvf src/*.so src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~
+       @echo Completed.
 
 modclean:
        rm -rf modules/*.so
        rm -rf src/modules/*.so
+       rm -rf src/modules/*.o
 
 squeakyclean: modclean clean