| --- build/packaging.rb.~1~ 2013-10-27 00:00:00.000000000 +0200 |
| +++ build/packaging.rb 2015-09-28 07:44:04.584236386 +0200 |
| @@ -575,7 +575,7 @@ |
| psg_ruby = ENV['RUBY'] || "#{fs_bindir}/ruby" |
| psg_free_ruby = ENV['FREE_RUBY'] || "/usr/bin/env ruby" |
| |
| - fakeroot = "pkg/fakeroot" |
| + fakeroot = ENV['DISTDIR'] |
| fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}" |
| fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}" |
| fake_libdir = "#{fakeroot}#{psg_libdir}" |
| @@ -593,7 +593,6 @@ |
| |
| packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb" |
| |
| - sh "rm -rf #{fakeroot}" |
| sh "mkdir -p #{fakeroot}" |
| |
| # Ruby sources |
| @@ -690,10 +689,6 @@ |
| change_shebang("#{fake_sbindir}/#{exe}", shebang) |
| end |
| |
| - # Apache 2 module |
| - sh "mkdir -p #{File.dirname(fake_apache2_module_path)}" |
| - sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}" |
| - |
| # Ruby extension sources |
| sh "mkdir -p #{fake_ruby_extension_source_dir}" |
| sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}" |
