X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=360ea6a6f56742a63e58ed0e539c54a0e1a5b6d6;hb=6230b5c33d1820fd42f4c899468f1e963756df2b;hp=047415b4803232e15e8c31efa2e4c773977238ff;hpb=f5fbaa2ab7c5e83408d57343767e0ae255a37452;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index 047415b48..360ea6a6f 100644
--- 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,7 +30,13 @@ ircd:
 	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
 bininst:
+	@-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
@@ -35,11 +44,13 @@ config:
 	@cp conf/inspire.rules $(CONPATH)/inspire.rules.example
 	@cp docs/*.example $(CONPATH)
 clean:
-	rm -rf src/*.o
-	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