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: [PATCH] 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.
---
 configure             | 2 +-
 make/template/main.mk | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 103e072a5..68d03a29c 100755
--- a/configure
+++ b/configure
@@ -1008,7 +1008,7 @@ EOF
 
 		for my $var (qw(
 			CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID
-			STARTSCRIPT DESTINATION SOCKETENGINE
+			STARTSCRIPT DESTINATION SOCKETENGINE LOG_DIR
 		)) {
 			s/\@$var\@/$config{$var}/g;
 		}
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
-- 
2.39.2