diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-09-21 18:44:29 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-09-21 20:49:49 +0100 |
| commit | b8babf2c43edd0f1ee2997125c6ea4cd21e15d68 (patch) | |
| tree | 71ff647cf9515ff5ca9518cd2c37dc3c4314d67c /make/template/main.mk | |
| parent | ca9a56b7ac0ec2139ade835144369455baa757bc (diff) | |
Move the init scripts out of the prefix into the new script dir.
The previous directory was okay for home directory installs but
was problematic for system wide installs.
Diffstat (limited to 'make/template/main.mk')
| -rw-r--r-- | make/template/main.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index 49c77da05..ff464a228 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -45,6 +45,7 @@ MODPATH = "$(DESTDIR)@MODULE_DIR@" LOGPATH = "$(DESTDIR)@LOG_DIR@" DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" +SCRPATH = "$(DESTDIR)@SCRIPT_DIR@" INSTALL = install INSTUID = @UID@ INSTMODE_DIR = 0750 @@ -224,17 +225,18 @@ install: target @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH) @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) + @-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH) [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) ifndef INSPIRCD_STATIC [ "$(BUILDPATH)/modules/" -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so $(MODPATH) endif - -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(BASE) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(BASE)/.gdbargs 2>/dev/null + -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null ifeq ($(SYSTEM), darwin) - -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null endif ifeq ($(SYSTEM), linux) - -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.service $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.service $(SCRPATH) 2>/dev/null endif -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null @@ -253,7 +255,7 @@ endif @echo ' Binaries:' $(BINPATH) @echo ' Modules:' $(MODPATH) @echo ' Data:' $(DATPATH) - @echo 'To start the ircd, run:' $(BASE)/inspircd start + @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf @echo 'Examples are available at:' $(CONPATH)/examples/ @@ -275,9 +277,9 @@ deinstall: -rm -f $(MANPATH)/inspircd-genssl.1 -rm -f $(MODPATH)/m_*.so -rm -f $(MODPATH)/core_*.so - -rm -f $(BASE)/.gdbargs - -rm -f $(BASE)/inspircd.service - -rm -f $(BASE)/org.inspircd.plist + -rm -f $(SCRPATH)/.gdbargs + -rm -f $(SCRPATH)/inspircd.service + -rm -f $(SCRPATH)/org.inspircd.plist configureclean: rm -f .gdbargs |