diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-07-25 12:05:40 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-07-25 12:05:40 +0200 |
| commit | f62654a6859998f9d63eb22702c572d5ebcff15c (patch) | |
| tree | fd38985a6a7f94658c157da9a6f470d718f34eed /make | |
| parent | 9c285d9546ea5b99a5ae1ac5186206308ca2d38f (diff) | |
| parent | 2cc3d7ecb8cd77341215db5bb94cebf917a5c5ef (diff) | |
Merge insp20
Diffstat (limited to 'make')
| -rw-r--r-- | make/template/org.inspircd.plist | 4 | ||||
| -rw-r--r-- | make/utilities.pm | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/make/template/org.inspircd.plist b/make/template/org.inspircd.plist index ef5ef199b..4bcb3e7c3 100644 --- a/make/template/org.inspircd.plist +++ b/make/template/org.inspircd.plist @@ -5,14 +5,14 @@ <dict> <key>Iterations</key> <integer>3</integer> + <key>KeepAlive</key> + <true/> <key>Label</key> <string>org.inspircd</string> <key>LowPriorityIO</key> <true/> <key>Nice</key> <integer>1</integer> - <key>OnDemand</key> - <false/> <key>Program</key> <string>@BINARY_DIR@/inspircd</string> <key>ProgramArguments</key> diff --git a/make/utilities.pm b/make/utilities.pm index 404243966..7db557d11 100644 --- a/make/utilities.pm +++ b/make/utilities.pm @@ -162,6 +162,7 @@ sub promptstring($$$$$) sub make_rpath($;$) { my ($executable, $module) = @_; + return "" if defined $ENV{DISABLE_RPATH}; chomp(my $data = `$executable`); my $output = ""; while ($data =~ /-L(\S+)/) @@ -169,10 +170,10 @@ sub make_rpath($;$) my $libpath = $1; if (!exists $already_added{$libpath}) { - print "Adding extra library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n"; + print "Adding runtime library path to \e[1;32m$module\e[0m ... \e[1;32m$libpath\e[0m\n"; $already_added{$libpath} = 1; } - $output .= "-Wl,-rpath -Wl,$libpath -L$libpath " unless defined $main::opt_disablerpath; + $output .= "-Wl,-rpath -Wl,$libpath -L$libpath "; $data =~ s/-L(\S+)//; } return $output; @@ -458,6 +459,7 @@ sub translate_functions($$) close TF; my $replace = `perl $tmpfile`; chomp($replace); + unlink($tmpfile); $line =~ s/eval\("(.+?)"\)/$replace/; } while ($line =~ /pkgconflibs\("(.+?)","(.+?)","(.+?)"\)/) @@ -503,7 +505,7 @@ sub translate_functions($$) print "\nMake sure you have pkg-config installed\n"; print "\nIn the case of gnutls configuration errors on debian,\n"; print "Ubuntu, etc, you should ensure that you have installed\n"; - print "gnutls-bin as well as gnutls-dev and gnutls.\n"; + print "gnutls-bin as well as libgnutls-dev and libgnutls.\n"; exit; } else |