diff options
| author | Peter Powell <petpow@saberuk.com> | 2015-06-14 18:20:47 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2015-06-14 19:39:15 +0100 |
| commit | 2ad8a6791bbc548dee4156eaf661612bea3d310f (patch) | |
| tree | fd4f5d8c081d088f1c40be40e72e81773880ae00 | |
| parent | 10127b6540c6c30bdb1bfa4c0d4d4afe30c2f22e (diff) | |
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.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | make/template/main.mk | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -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 |