summaryrefslogtreecommitdiff
path: root/gem_prelude.rb
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 01:43:55 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-28 01:43:55 +0000
commitc2511c5f76bb043df8f54b135d156325d8fe80a1 (patch)
tree73352e313399cfe548af0428926847a221ed8ea1 /gem_prelude.rb
parentd9f21245adccdc3b85860aef97b68a3faf3f1884 (diff)
* gem_prelude.rb: considers --program-suffix and prefix configure
options. * lib/rubygems/defaults.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@19975 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 422110224b..7c54bdd9d3 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"