diff options
| author | Peter Powell <petpow@saberuk.com> | 2014-10-01 19:52:25 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2014-12-07 22:36:42 +0000 |
| commit | 500a0524d94d596b327ed9aaa17fd0a8ce9ebf96 (patch) | |
| tree | 56e94dda14aada898d8fedc01bc3519c5ff2c0b2 /make/template | |
| parent | 11f4d02e7020cb5775d2b89af0e652e53cd90ed7 (diff) | |
Miscellaneous improvements to configure.
- Clean up various minor sections of the code.
- Remove OpenSSL and GnuTLS detection plumbing.
- This will soon be the job of modulemanager.
- This did not work in non-interactive mode unlike --enable-extras.
- Rework runas user handling.
- Add the --gid configure option.
- Accept either an id or a name in --gid and --uid.
- Rework the question flow in interactive mode.
- User is no longer asked detailed questions unless they want them.
- Socket engine questions have been removed.
- Automatically enable non-interactive mode if STDIN or STDOUT are not
a tty.
Diffstat (limited to 'make/template')
| -rw-r--r-- | make/template/main.mk | 13 | ||||
| -rw-r--r-- | make/template/org.inspircd.plist | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index 5806d568a..c78d9047d 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -43,6 +43,7 @@ CORELDFLAGS = -rdynamic -L. $(LDFLAGS) PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS) BASE = "$(DESTDIR)@BASE_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" +MANPATH = "$(DESTDIR)@MANUAL_DIR@" MODPATH = "$(DESTDIR)@MODULE_DIR@" DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" @@ -225,6 +226,7 @@ install: target @-$(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) $(MANPATH) @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) [ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH) @IFNDEF PURE_STATIC @@ -238,10 +240,11 @@ install: target @IFEQ $(SYSTEM) linux -$(INSTALL) -m $(INSTMODE_LIB) inspircd.service $(BASE) 2>/dev/null @ENDIF - -$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(BASE) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(BASE) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples + -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules @echo "" @@ -273,8 +276,11 @@ clean: deinstall: -rm -f $(BINPATH)/inspircd -rm -rf $(CONPATH)/examples + -rm -f $(MANPATH)/inspircd.1 + -rm -f $(MANPATH)/inspircd-genssl.1 -rm -f $(MODPATH)/*.so -rm -f $(BASE)/.gdbargs + -rm -f $(BASE)/inspircd.service -rm -f $(BASE)/org.inspircd.plist configureclean: @@ -283,6 +289,9 @@ configureclean: rm -f GNUmakefile rm -f include/config.h rm -f inspircd + rm -f inspircd.1 + rm -f inspircd-genssl.1 + -rm -f inspircd.service -rm -f org.inspircd.plist distclean: clean configureclean diff --git a/make/template/org.inspircd.plist b/make/template/org.inspircd.plist index 4bcb3e7c3..07a3446b5 100644 --- a/make/template/org.inspircd.plist +++ b/make/template/org.inspircd.plist @@ -23,6 +23,8 @@ <key>ServiceIPC</key> <false/> <key>UserName</key> - <string>ircdaemon</string> + <string>@USER@</string> + <key>GroupName</key> + <string>@GROUP@</string> </dict> </plist> |