File: fix_install_path.patch

package info (click to toggle)
passenger 6.0.26%2Bds-1.1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 58,744 kB
  • sloc: cpp: 701,269; ruby: 44,712; ansic: 27,819; javascript: 5,948; python: 1,158; sh: 1,000; makefile: 51
file content (27 lines) | stat: -rw-r--r-- 1,405 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
From: Laurent Bigonville <bigon@debian.org>
Date: Fri, 6 May 2022 12:58:18 -0300
Subject: Install in vendor_ruby directory and install common files in
 non-versioned path

Last-Update: 2015-05-02
---
 build/packaging.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/packaging.rb b/build/packaging.rb
index f065978..955612f 100644
--- a/build/packaging.rb
+++ b/build/packaging.rb
@@ -131,10 +131,10 @@ def change_shebang(filename, value)
   # We don't use CONFIG['archdir'] and the like because we want
   # the files to be installed to /usr, and the Ruby interpreter
   # on the packaging machine might be in /usr/local.
-  psg_rubylibdir = ENV['RUBYLIBDIR'] || "#{fs_libdir}/ruby/vendor_ruby"
+  psg_rubylibdir = ENV['RUBYLIBDIR'] || CONFIG['vendordir'].sub(/^\/usr/,fs_prefix)
   psg_nodelibdir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/node"
   psg_libdir     = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}"
-  psg_native_support_dir = ENV["RUBYARCHDIR"] || "#{fs_libdir}/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
+  psg_native_support_dir = ENV["RUBYARCHDIR"] || CONFIG['vendorarchdir'].sub(/^\/usr/,fs_prefix)
   psg_support_binaries_dir = "#{fs_libdir}/#{GLOBAL_NAMESPACE_DIRNAME}/support-binaries"
   psg_helper_scripts_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
   psg_resources_dir      = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}"