Merge pull request #1181 from SaberUK/insp20+null

[user/henk/code/inspircd.git] / make / template / main.mk

diff --git a/make/template/main.mk b/make/template/main.mk
index c044bdaaac6a2713d12aaabb6e99132979703046..23daa7efc02a0d2069cc70f694b56958f1870571 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -89,6 +89,11 @@ INSTMODE_LIB = 0644
   D=0
 @ENDIF
 
+GCC6=@GCC6@
+@IFEQ $(GCC6) true
+  CXXFLAGS += -fno-delete-null-pointer-checks
+@ENDIF
+
 DBGOK=0
 @IFEQ $(D) 0
   CXXFLAGS += -O2
@@ -220,22 +225,22 @@ install: target
                echo ""; \
                exit 1; \
        fi
-       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) "$(BASE)"
-       @-$(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) "$(MODPATH)"
-       [ "$(BUILDPATH)/bin/" -ef "$(BINPATH)" ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" "$(BINPATH)"
+       @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
+       @-$(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) $(MODPATH)
+       [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
 @IFNDEF PURE_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) @STARTSCRIPT@ "$(BASE)" 2>/dev/null
-       -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs "$(BASE)/.gdbargs" 2>/dev/null
-       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example "$(CONPATH)/examples"
-       -$(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_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+       -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+       -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
        @echo ""
        @echo "*************************************"
        @echo "*        INSTALL COMPLETE!          *"
@@ -265,11 +270,12 @@ clean:
        @echo Completed.
 
 deinstall:
-       -rm -f "$(BINPATH)/inspircd"
-       -rm -rf "$(CONPATH)/examples"
-       -rm -f "$(MODPATH)/*.so"
-       -rm -f "$(BASE)/.gdbargs"
-       -rm -f "$(BASE)/org.inspircd.plist"
+       -rm -f $(BINPATH)/inspircd
+       -rm -rf $(CONPATH)/examples
+       -rm -f $(MODPATH)/cmd_*.so
+       -rm -f $(MODPATH)/m_*.so
+       -rm -f $(BASE)/.gdbargs
+       -rm -f $(BASE)/org.inspircd.plist
 
 squeakyclean: distclean