X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=d4f8d4745fb943bc4a3261446cabbdf5115824cb;hb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;hp=1c91237b3f80e7548de340d1a941a430ab7581ce;hpb=3b624fd022aa02b882dd4f9b4f92236ce41da779;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index 1c91237b3..d4f8d4745 100644
--- 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,10 +15,12 @@ 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)'
+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,7 +29,12 @@ ircd:
 	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 bininst:
+	@-rm -f $(BINPATH)/*.so
+	@-rm -f $(BINPATH)/inspircd
+	@-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
@@ -35,10 +42,15 @@ config:
 	@cp conf/inspire.rules $(CONPATH)/inspire.rules.example
 	@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