Changed to fix minor typo in dynamic-build makefile

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

diff --git a/.Makefile.inc b/.Makefile.inc
index 4485ef78f794b17b1eca6ffd0dc3e1a9e587ebec..f7a0ba484f87be9d6e0d523a06d934ea7b6f65e7 100644 (file)
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -7,7 +7,7 @@
 # Small modifications by <brain@ChatSpike.net>
 #
 
-CC = g++
+CC = @CC@
 MAKE = @MAKEPROG@
 PROGS = inspircd
 FLAGS = @FLAGS@
@@ -15,8 +15,9 @@ LDLIBS = @LDLIBS@
 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)'
+MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODULES=${MODULES}' 'MODPATH=$(MODPATH)' 'LIBPATH=$(LIBPATH)'
 
 all : ircd mods config bininst
 
@@ -27,8 +28,10 @@ ircd:
        ${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 bininst:
-       @-cp src/*.so $(BINPATH)
+       @-cp src/*.so $(LIBPATH)
        @-cp src/inspircd $(BINPATH)
+       @-chmod 0700 $(BINPATH)/inspircd
+       @-chmod 0700 $(LIBPATH)/*.so
 
 config:
        @cp conf/inspire.motd $(CONPATH)/inspire.motd.example
@@ -37,11 +40,14 @@ config:
        @cp docs/*.example $(CONPATH)
 clean:
        rm -rf src/*.so
+       rm -rf src/*.o
        rm -rf src/inspircd
        rm -rf src/modules/*.so
+       rm -rf src/modules/*.o
 
 modclean:
        rm -rf modules/*.so
        rm -rf src/modules/*.so
+       rm -rf src/modules/*.o
 
 squeakyclean: modclean clean