cb29cc2d52
Ignore EINVAL from sigaltstack, seems to be what ruby itself does in 1.9 committing on behalf of jeremy@, who did all the work, tested on i386 and tested packaging on amd64. All so I can commit a simple nginx update... THANKS. ok jasper
24 lines
1.3 KiB
Plaintext
24 lines
1.3 KiB
Plaintext
$OpenBSD: patch-ext_common_ResourceLocator_h,v 1.2 2011/05/17 03:25:18 william Exp $
|
|
--- ext/common/ResourceLocator.h.orig Thu Feb 17 07:05:08 2011
|
|
+++ ext/common/ResourceLocator.h Wed Apr 27 10:40:04 2011
|
|
@@ -65,13 +65,13 @@ class ResourceLocator { (public)
|
|
!fileExists(root + "/DEVELOPERS.TXT");
|
|
|
|
if (nativelyPackaged) {
|
|
- agentsDir = "/usr/lib/phusion-passenger/agents";
|
|
- helperScriptsDir = "/usr/share/phusion-passenger/helper-scripts";
|
|
- resourcesDir = "/usr/share/phusion-passenger";
|
|
- docDir = "/usr/share/doc/phusion-passenger";
|
|
+ agentsDir = "${LOCALBASE}/lib/phusion-passenger/agents";
|
|
+ helperScriptsDir = "${LOCALBASE}/share/phusion-passenger/helper-scripts";
|
|
+ resourcesDir = "${LOCALBASE}/share/phusion-passenger";
|
|
+ docDir = "${LOCALBASE}/share/doc/phusion-passenger";
|
|
rubyLibDir = "";
|
|
- compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
|
|
- apache2Module = "/usr/lib/apache2/modules/mod_passenger.so";
|
|
+ compilableSourceDir = "${LOCALBASE}/share/phusion-passenger/compilable-source";
|
|
+ apache2Module = "${LOCALBASE}/lib/apache2/modules/mod_passenger.so";
|
|
} else {
|
|
agentsDir = root + "/agents";
|
|
helperScriptsDir = root + "/helper-scripts";
|