summaryrefslogtreecommitdiff
path: root/gem_prelude.rb
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 08:21:50 (GMT)
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 08:21:50 (GMT)
commite3e645f43a3a2382a4fc38a5420e89b351c5b0c1 (patch)
tree9e7d9b1b32ac0d8d2d8a6ed926aefdbeb974980f /gem_prelude.rb
parentb39833e1d768c5461cbf1475367677eb0ec15ba3 (diff)
merged r19975 and r19978 from ruby_1_9_1 into trunk.
* gem_prelude.rb: considers --program-suffix and prefix configure options. * lib/rubygems/defaults.rb: ditto. * test/rubygems/test_gem.rb (@default_dir_re): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gem_prelude.rb')
-rw-r--r--gem_prelude.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 4221102..7c54bdd 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -113,7 +113,7 @@ if defined?(Gem) then
undef_method :gem if method_defined? :gem
end
- $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
+ $".delete File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], 'rubygems.rb')
require 'rubygems'
@@ -230,7 +230,7 @@ if defined?(Gem) then
begin
Gem.push_all_highest_version_gems_on_load_path
- $" << File.join(Gem::ConfigMap[:libdir], "ruby",
+ $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
Gem::ConfigMap[:ruby_version], "rubygems.rb")
rescue Exception => e
puts "Error loading gem paths on load path in gem_prelude"