From 2ad8a6791bbc548dee4156eaf661612bea3d310f Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Sun, 14 Jun 2015 18:20:47 +0100
Subject: Fix system-wide installation of the data and log directories.

The existing method works fine when building with the default
paths but breaks when you are doing a system-wide installation.
---
 make/template/main.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'make/template')

diff --git a/make/template/main.mk b/make/template/main.mk
index d5705d928..1dff0fc20 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -42,6 +42,7 @@ PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS)
 BASE = "$(DESTDIR)@BASE_DIR@"
 CONPATH = "$(DESTDIR)@CONFIG_DIR@"
 MODPATH = "$(DESTDIR)@MODULE_DIR@"
+LOGPATH = "$(DESTDIR)@LOG_DIR@"
 DATPATH = "$(DESTDIR)@DATA_DIR@"
 BINPATH = "$(DESTDIR)@BINARY_DIR@"
 INSTALL = install
@@ -220,8 +221,8 @@ install: target
 		exit 1; \
 	fi
 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
-	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
-	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+	@-$(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
-- 
cgit v1.2.3


From 0207736989eb1bdd576386992fca33a4b92629c5 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Tue, 23 Jun 2015 22:45:03 +0100
Subject: Log STDOUT and STDERR in the launchd script.

---
 make/template/org.inspircd.plist | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'make/template')

diff --git a/make/template/org.inspircd.plist b/make/template/org.inspircd.plist
index 2656d1df3..4dac209f6 100644
--- a/make/template/org.inspircd.plist
+++ b/make/template/org.inspircd.plist
@@ -21,6 +21,10 @@
 	</array>
 	<key>ServiceIPC</key>
 	<false/>
+	<key>StandardOutPath</key>
+	<string>@LOG_DIR@/launchd-stdout.log</string>
+	<key>StandardErrorPath</key>
+	<string>@LOG_DIR@/launchd-stderr.log</string>
 	<key>UserName</key>
 	<string>ircdaemon</string>
 </dict>
-- 
cgit v1.2.3


From 7da9057946af3f82f846547b31c208de1e57237c Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Wed, 29 Jul 2015 23:45:39 +0100
Subject: Fix "make -jX debug install" causing linker errors.

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

(limited to 'make/template')

diff --git a/make/template/main.mk b/make/template/main.mk
index 1dff0fc20..fa2375ac1 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -314,4 +314,6 @@ help:
 	@echo ' deinstall Removes the files created by "make install"'
 	@echo
 
+.NOTPARALLEL:
+
 .PHONY: all target debug debug-header mod-header mod-footer std-header finishmessage install clean deinstall squeakyclean configureclean help
-- 
cgit v1.2.3