diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-02-22 12:52:18 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-02-22 12:52:18 +0100 |
| commit | 0b63ccd0b5cb26883d6becb196fb98e4f95d0397 (patch) | |
| tree | d9c660b46e106d76c5953579eca45e49c4486cbf /make | |
| parent | 7b6bd133ca4472f6cb8058d5e34e3c8b2af7e99a (diff) | |
| parent | 1624ab03b86542a2cb02eda809303144974755f3 (diff) | |
Merge insp20
Diffstat (limited to 'make')
| -rw-r--r-- | make/template/main.mk | 7 | ||||
| -rw-r--r-- | make/template/org.inspircd.plist | 4 | ||||
| -rw-r--r-- | make/test/eventfd.cpp | 2 | ||||
| -rw-r--r-- | make/test/kqueue.cpp | 1 | ||||
| -rw-r--r-- | make/utilities.pm | 3 |
5 files changed, 14 insertions, 3 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index 3e7ee1844..cc201a126 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -45,6 +45,7 @@ BASE = "$(DESTDIR)@BASE_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" MANPATH = "$(DESTDIR)@MANUAL_DIR@" MODPATH = "$(DESTDIR)@MODULE_DIR@" +LOGPATH = "$(DESTDIR)@LOG_DIR@" DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" INSTALL = install @@ -217,8 +218,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 @@ -322,4 +323,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 configureclean help diff --git a/make/template/org.inspircd.plist b/make/template/org.inspircd.plist index 07a3446b5..ae4e90916 100644 --- a/make/template/org.inspircd.plist +++ b/make/template/org.inspircd.plist @@ -22,6 +22,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>@USER@</string> <key>GroupName</key> diff --git a/make/test/eventfd.cpp b/make/test/eventfd.cpp index 980d04485..9b38b793b 100644 --- a/make/test/eventfd.cpp +++ b/make/test/eventfd.cpp @@ -1,6 +1,8 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2012 William Pitcock <nenolod@dereferenced.org> + * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/test/kqueue.cpp b/make/test/kqueue.cpp index a8b9882cf..708677adf 100644 --- a/make/test/kqueue.cpp +++ b/make/test/kqueue.cpp @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org> * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/utilities.pm b/make/utilities.pm index 565ac5fff..f2d645f33 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -32,6 +32,7 @@ use warnings FATAL => qw(all); use Exporter 'import'; use Fcntl; use File::Path; +use File::Temp; use Getopt::Long; use POSIX; @@ -345,7 +346,7 @@ sub translate_functions($$) my $tmpfile; do { - $tmpfile = tmpnam(); + $tmpfile = File::Temp::tmpnam(); } until sysopen(TF, $tmpfile, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0700); print "(Created and executed \e[1;32m$tmpfile\e[0m)\n"; print TF $1; |