X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Fmain.mk;h=50feb8f8d01ab505aa87d43cc031eab952d94d4b;hb=c6a508a3da977041909f18f77d6e8fea942512cf;hp=78de3a8d1f452bcbdaf2bc30425879be3c44a086;hpb=9180e4664e8b76c53a96f98d82362482450bde84;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/template/main.mk b/make/template/main.mk
index 78de3a8d1..50feb8f8d 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -114,23 +114,20 @@ FOOTER = finishmessage
 @TARGET GNU_MAKE SOURCEPATH = $(shell /bin/pwd)
 @TARGET BSD_MAKE SOURCEPATH != /bin/pwd
 
-@IFDEF INSPIRCD_VERBOSE
-  VERBOSE = -v
-@ELSE
+@IFNDEF INSPIRCD_VERBOSE
   @TARGET GNU_MAKE MAKEFLAGS += --silent
   @TARGET BSD_MAKE MAKE += -s
-  VERBOSE =
 @ENDIF
 
 @IFDEF INSPIRCD_STATIC
   CORECXXFLAGS += -DINSPIRCD_STATIC
 @ENDIF
 
-# Add the users CXXFLAGS to the base ones to allow them to override
-# things like -Wfatal-errors if they wish to.
-CORECXXFLAGS += $(CXXFLAGS)
+# Add the users CPPFLAGS/CXXFLAGS to the base ones to allow them to
+# override things like -Wfatal-errors if they wish to.
+CORECXXFLAGS += $(CPPFLAGS) $(CXXFLAGS)
 
-@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS INSPIRCD_VERBOSE SOCKETENGINE CORELDFLAGS
 @DO_EXPORT SOURCEPATH BUILDPATH INSPIRCD_STATIC
 
 # Default target
@@ -157,7 +154,7 @@ all: $(FOOTER)
 
 target: $(HEADER)
 	$(MAKEENV) perl make/calcdep.pl
-	cd $(BUILDPATH); $(MAKEENV) $(MAKE) -f real.mk $(TARGET)
+	cd "$(BUILDPATH)"; $(MAKEENV) $(MAKE) -f real.mk $(TARGET)
 
 debug:
 	@${MAKE} INSPIRCD_DEBUG=1 all
@@ -221,13 +218,13 @@ install: target
 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
-	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
+	[ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
 @IFNDEF INSPIRCD_STATIC
-	[ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
+	[ "$(BUILDPATH)/modules/" -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so $(MODPATH)
 @ENDIF
 	-$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(BASE) 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(BASE)/.gdbargs 2>/dev/null
@@ -241,9 +238,9 @@ install: target
 	-$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
-	-$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null
-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
 	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/services/*.example $(CONPATH)/examples/services
+	-$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null
 	@echo ""
 	@echo "*************************************"
 	@echo "*        INSTALL COMPLETE!          *"
@@ -264,10 +261,10 @@ GNUmakefile BSDmakefile: make/template/main.mk src/version.sh configure @CONFIGU
 
 clean:
 	@echo Cleaning...
-	-rm -f $(BUILDPATH)/bin/inspircd $(BUILDPATH)/include $(BUILDPATH)/real.mk
-	-rm -rf $(BUILDPATH)/obj $(BUILDPATH)/modules
-	@-rmdir $(BUILDPATH)/bin 2>/dev/null
-	@-rmdir $(BUILDPATH) 2>/dev/null
+	-rm -f "$(BUILDPATH)/bin/inspircd" "$(BUILDPATH)/include" "$(BUILDPATH)/real.mk"
+	-rm -rf "$(BUILDPATH)/obj" "$(BUILDPATH)/modules"
+	@-rmdir "$(BUILDPATH)/bin" 2>/dev/null
+	@-rmdir "$(BUILDPATH)" 2>/dev/null
 	@echo Completed.
 
 deinstall:
@@ -275,25 +272,22 @@ deinstall:
 	-rm -rf $(CONPATH)/examples
 	-rm -f $(MANPATH)/inspircd.1
 	-rm -f $(MANPATH)/inspircd-genssl.1
-	-rm -f $(MODPATH)/*.so
+	-rm -f $(MODPATH)/m_*.so
+	-rm -f $(MODPATH)/core_*.so
 	-rm -f $(BASE)/.gdbargs
 	-rm -f $(BASE)/inspircd.service
 	-rm -f $(BASE)/org.inspircd.plist
 
 configureclean:
+	rm -f .gdbargs
 	rm -f BSDmakefile
 	rm -f GNUmakefile
 	rm -f include/config.h
-	rm -f inspircd
-	rm -f inspircd.1
-	rm -f inspircd-genssl.1
-	-rm -f inspircd.service
-	-rm -f org.inspircd.plist
-	-rm -f @CONFIGURE_CACHE_FILE@
+	rm -rf @CONFIGURE_DIRECTORY@
 
 distclean: clean configureclean
-	-rm -rf $(SOURCEPATH)/run
-	find $(SOURCEPATH)/src/modules -type l | xargs rm -f
+	-rm -rf "$(SOURCEPATH)/run"
+	find "$(SOURCEPATH)/src/modules" -type l | xargs rm -f
 
 help:
 	@echo 'InspIRCd Makefile'