From ba0649304a73f7a5109af9a97a0ecbe3f4bbed36 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Fri, 25 Mar 2016 11:38:54 +0000
Subject: Partially revert "Quote paths in the makefile".

There is no need to quote BASE and {BIN,CON,DAT,MOD,LOG}PATH
because they are alreaady quoted. {BUILD,SOURCE}PATH however
are unquoted so their usages still need to be quoted.

This reverts commit dbcbf9647d0abb421f8a84b41e674f403c91ce8f.
---
 make/template/main.mk | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'make')

diff --git a/make/template/main.mk b/make/template/main.mk
index c044bdaaa..2a220f5a8 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -220,22 +220,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 +265,11 @@ 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)/*.so
+	-rm -f $(BASE)/.gdbargs
+	-rm -f $(BASE)/org.inspircd.plist
 
 squeakyclean: distclean
 
-- 
cgit v1.2.3


From eced5062205cb9c2ae4af5ca0972340059ae3363 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Fri, 25 Mar 2016 11:44:51 +0000
Subject: Delete modules cautiously when doing a deinstall.

---
 make/template/main.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'make')

diff --git a/make/template/main.mk b/make/template/main.mk
index 2a220f5a8..08787a1bf 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -267,7 +267,8 @@ clean:
 deinstall:
 	-rm -f $(BINPATH)/inspircd
 	-rm -rf $(CONPATH)/examples
-	-rm -f $(MODPATH)/*.so
+	-rm -f $(MODPATH)/cmd_*.so
+	-rm -f $(MODPATH)/m_*.so
 	-rm -f $(BASE)/.gdbargs
 	-rm -f $(BASE)/org.inspircd.plist
 
-- 
cgit v1.2.3