|
 |
8d15f25 |
diff --git a/ext/common/ResourceLocator.h b/ext/common/ResourceLocator.h
|
|
|
8d15f25 |
index ae75261..a445ad0 100644
|
|
|
8d15f25 |
--- a/ext/common/ResourceLocator.h
|
|
|
8d15f25 |
+++ b/ext/common/ResourceLocator.h
|
|
|
8d15f25 |
@@ -65,13 +65,13 @@ public:
|
|
|
8d15f25 |
!fileExists(root + "/DEVELOPERS.TXT");
|
|
|
8d15f25 |
|
|
|
8d15f25 |
if (nativelyPackaged) {
|
|
|
8d15f25 |
- agentsDir = "/usr/lib/phusion-passenger/agents";
|
|
|
8d15f25 |
- helperScriptsDir = "/usr/share/phusion-passenger/helper-scripts";
|
|
|
8d15f25 |
- resourcesDir = "/usr/share/phusion-passenger";
|
|
|
8d15f25 |
- docDir = "/usr/share/doc/phusion-passenger";
|
|
|
8d15f25 |
+ agentsDir = "%%AGENTS_DIR%%";
|
|
|
8d15f25 |
+ helperScriptsDir = "%%GEM_INSTALL_DIR%%/helper-scripts";
|
|
|
8d15f25 |
+ resourcesDir = "%%GEM_INSTALL_DIR%%";
|
|
|
8d15f25 |
+ docDir = "%%GEM_INSTALL_DIR%%/doc";
|
|
|
8d15f25 |
rubyLibDir = "";
|
|
|
8d15f25 |
- compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
|
|
|
8d15f25 |
- apache2Module = "/usr/lib/apache2/modules/mod_passenger.so";
|
|
|
8d15f25 |
+ compilableSourceDir = "%%GEM_INSTALL_DIR%%";
|
|
|
8d15f25 |
+ apache2Module = "%%APACHE_INSTALLED_MOD%%";
|
|
|
8d15f25 |
} else {
|
|
|
8d15f25 |
agentsDir = root + "/agents";
|
|
|
8d15f25 |
helperScriptsDir = root + "/helper-scripts";
|
|
|
8d15f25 |
diff --git a/lib/phusion_passenger.rb b/lib/phusion_passenger.rb
|
|
|
8d15f25 |
index 28265df..d9a3c40 100644
|
|
|
8d15f25 |
--- a/lib/phusion_passenger.rb
|
|
|
8d15f25 |
+++ b/lib/phusion_passenger.rb
|
|
|
8d15f25 |
@@ -39,11 +39,11 @@ module PhusionPassenger
|
|
|
8d15f25 |
# using the OS's native package management system, i.e. as opposed
|
|
|
8d15f25 |
# to being installed from source or with RubyGems.
|
|
|
8d15f25 |
def self.natively_packaged?
|
|
|
8d15f25 |
- if !defined?(@natively_packaged)
|
|
|
8d15f25 |
- @natively_packaged = !File.exist?("#{LIBDIR}/../Rakefile") ||
|
|
|
8d15f25 |
- !File.exist?("#{LIBDIR}/../DEVELOPERS.TXT")
|
|
|
8d15f25 |
- end
|
|
|
8d15f25 |
- return @natively_packaged
|
|
|
8d15f25 |
+ if !defined?(@natively_packaged)
|
|
|
8d15f25 |
+ @natively_packaged = !File.exist?("#{LIBDIR}/../Rakefile") ||
|
|
|
8d15f25 |
+ !File.exist?("#{LIBDIR}/../DEVELOPERS.TXT")
|
|
|
8d15f25 |
+ end
|
|
|
8d15f25 |
+ return @natively_packaged
|
|
|
8d15f25 |
end
|
|
|
8d15f25 |
|
|
|
8d15f25 |
NATIVELY_PACKAGED_SOURCE_ROOT = "/usr/share/phusion-passenger/source"
|
|
|
8d15f25 |
@@ -94,12 +94,13 @@ module PhusionPassenger
|
|
|
8d15f25 |
# Not available when natively packaged.
|
|
|
8d15f25 |
NATIVE_SUPPORT_DIR = File.join(SOURCE_ROOT, "ext", "ruby")
|
|
|
8d15f25 |
else
|
|
|
8d15f25 |
- SOURCE_ROOT = NATIVELY_PACKAGED_SOURCE_ROOT
|
|
|
8d15f25 |
- DOCDIR = NATIVELY_PACKAGED_DOCDIR
|
|
|
8d15f25 |
- RESOURCES_DIR = NATIVELY_PACKAGED_RESOURCES_DIR
|
|
|
8d15f25 |
- AGENTS_DIR = NATIVELY_PACKAGED_AGENTS_DIR
|
|
|
8d15f25 |
- HELPER_SCRIPTS_DIR = NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR
|
|
|
8d15f25 |
- APACHE2_MODULE = NATIVELY_PACKAGED_APACHE2_MODULE
|
|
|
8d15f25 |
+ SOURCE_ROOT = '%%GEM_INSTALL_DIR%%'
|
|
|
8d15f25 |
+ DOCDIR = "#{SOURCE_ROOT}/doc"
|
|
|
8d15f25 |
+ RESOURCES_DIR = "#{SOURCE_ROOT}/resources"
|
|
|
8d15f25 |
+ AGENTS_DIR = '%%AGENTS_DIR%%'
|
|
|
8d15f25 |
+ HELPER_SCRIPTS_DIR = "#{SOURCE_ROOT}/helper-scripts"
|
|
|
8d15f25 |
+ APACHE2_MODULE = '%%APACHE_INSTALLED_MOD%%'
|
|
|
8d15f25 |
+ NATIVE_SUPPORT_DIR = "%%NATIVE_SUPPORT_DIR%%"
|
|
|
8d15f25 |
end
|
|
|
8d15f25 |
|
|
|
8d15f25 |
|
|
|
8d15f25 |
diff --git a/lib/phusion_passenger/native_support.rb b/lib/phusion_passenger/native_support.rb
|
|
|
8d15f25 |
index f1edf1c..4312d01 100644
|
|
|
8d15f25 |
--- a/lib/phusion_passenger/native_support.rb
|
|
|
8d15f25 |
+++ b/lib/phusion_passenger/native_support.rb
|
|
|
8d15f25 |
@@ -38,10 +38,7 @@ class NativeSupportLoader
|
|
|
8d15f25 |
|
|
|
8d15f25 |
private
|
|
|
8d15f25 |
def archdir
|
|
|
8d15f25 |
- @archdir ||= begin
|
|
|
8d15f25 |
- require 'phusion_passenger/platform_info/binary_compatibility'
|
|
|
8d15f25 |
- PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
|
|
|
8d15f25 |
- end
|
|
|
8d15f25 |
+ @archdir ||= 'native'
|
|
|
8d15f25 |
end
|
|
|
8d15f25 |
|
|
|
8d15f25 |
def libext
|