X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.Makefile.inc;h=675a4fa995dc325288281ba04d5d5fe9815ef9ef;hb=e381b06561228aaea752deda20a62c6dc99a560e;hp=1ef3c4375cd6a4513c08a9bc0101decfbe62c1b6;hpb=e30cee65998b196c990379d15e96a56ca6665c48;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.Makefile.inc b/.Makefile.inc
index 1ef3c4375..675a4fa99 100644
--- a/.Makefile.inc
+++ b/.Makefile.inc
@@ -24,47 +24,60 @@ MAKEARGS = 'PROGS=${PROGS}' 'FLAGS=${FLAGS}' 'CC=${CC}' 'LDLIBS=${LDLIBS}' 'MODU
 all : @MAKEORDER@
 
 mods:
+	@echo "Making modules..."
 	${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS)
+	@echo "*************************************"
+	@echo "*        BUILD COMPLETE!            *"
+	@echo "*   To install InspIRCd, type:      *"
+	@echo "*         make install              *"
+	@echo "*************************************"
 
 ircd:
+	@echo "Making ircd..."
 	${MAKE} -C src DIRNAME="src" $(MAKEARGS)
 
-bininst:
-	install -C -v -m 0700 src/libIRCDaes.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDasyncdns.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDbase.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDchannels.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDcommand_parse.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDcommands.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDcull_list.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDdnsqueue.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDdynamic.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDhash.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDhelper.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDio.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDmessage.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDmode.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDmodules.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDsocket.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDsocketengine.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDstring.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDuserprocess.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDusers.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDwildcard.so $(LIBPATH)
-	install -C -v -m 0700 src/libIRCDxline.so $(LIBPATH)
-	install -C -v -m 0700 src/inspircd $(BINPATH)
-	install -C -v -m 0700 inspircd $(BASE)
+install: all
+	@-install -v -m 0700 src/libIRCDaes.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDasyncdns.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDbase.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDchannels.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDcommand_parse.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDcommands.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDconfigreader.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDcull_list.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDdynamic.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDhash.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDhelper.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDinspsocket.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDmessage.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDmode.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDmodules.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDsocket.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDsocketengine.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDstring.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDuserprocess.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDusers.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDwildcard.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDxline.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDtimer.so $(LIBPATH)
+	@-install -v -m 0700 src/libIRCDsnomasks.so $(LIBPATH)
+	@-install -v -m 0700 src/inspircd $(BINPATH)
+	@-install -v -m 0700 inspircd $(BASE) 2>/dev/null
+	@-cp .gdbargs $(BASE)
+	@-cp conf/inspircd.quotes.example $(CONPATH)
+	@-cp conf/inspircd.rules.example $(CONPATH)
+	@-cp conf/key.pem $(CONPATH)
+	@-cp conf/cert.pem $(CONPATH)
+	@-cp docs/inspircd.conf.example $(CONPATH)
+	${MAKE} -C src/modules DIRNAME="src/modules" $(MAKEARGS) modinst
 	@echo "*************************************"
-	@echo "*      BUILD COMPLETE!              *"
+	@echo "*        INSTALL COMPLETE!          *"
 	@echo "* It is safe to ignore any messages *"
 	@echo "* related to copying of files.      *"
+	@echo "*                                   *"
+	@echo "* REMEMBER TO EDIT YOUR CONFIG FILE *"
 	@echo "*************************************"
 
-config:
-	@cp conf/inspire.motd $(CONPATH)/inspire.motd.example
-	@cp conf/inspire.quotes $(CONPATH)/inspire.quotes.example
-	@cp conf/inspire.rules $(CONPATH)/inspire.rules.example
-	@cp docs/inspircd.conf.example $(CONPATH)
 clean:
 	@echo Cleaning...
 	@rm -rvf src/*.so src/*.o src/inspircd src/modules/*.so src/modules/*.o *~ src/*~ src/modules/*~ src/modules/extra/*~