blob: 7f31469f62e0ab87ea50bcccdcc8b5af4afd052a (
plain)
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
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
$NetBSD: patch-ah,v 1.14 2014/02/19 15:47:32 taca Exp $
Add install_root option for pkgsrc's rubygems support.
--- lib/rubygems.rb.orig 2013-09-09 23:41:27.000000000 +0000
+++ lib/rubygems.rb
@@ -291,11 +291,17 @@ module Gem
##
# The path where gem executables are to be installed.
- def self.bindir(install_dir=Gem.dir)
+ def self.bindir(install_dir=Gem.dir, install_root=nil)
# TODO: move to Gem::Dirs
- return File.join install_dir, 'bin' unless
- install_dir.to_s == Gem.default_dir.to_s
- Gem.default_bindir
+ if install_dir.to_s == Gem.default_dir.to_s
+ install_dir = Gem.default_bindir
+ else
+ install_dir = File.join install_dir, 'bin'
+ end
+ unless install_root.nil? or install_root.empty?
+ install_dir = File.join install_root, install_dir
+ end
+ install_dir
end
##
@@ -551,12 +557,12 @@ module Gem
##
# The index to insert activated gem paths into the $LOAD_PATH.
#
- # Defaults to the site lib directory unless gem_prelude.rb has loaded paths,
+ # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths,
# then it inserts the activated gem's paths before the gem_prelude.rb paths
# so you can override the gem_prelude.rb default $LOAD_PATH paths.
def self.load_path_insert_index
- index = $LOAD_PATH.index ConfigMap[:sitelibdir]
+ index = $LOAD_PATH.index ConfigMap[:vendorlibdir]
index
end
@@ -729,6 +735,7 @@ module Gem
prefix = File.dirname RUBYGEMS_DIR
if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
+ prefix != File.expand_path(ConfigMap[:vendorlibdir]) and
prefix != File.expand_path(ConfigMap[:libdir]) and
'lib' == File.basename(RUBYGEMS_DIR) then
prefix
|
