diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-28 01:43:55 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-28 01:43:55 +0000 |
| commit | c2511c5f76bb043df8f54b135d156325d8fe80a1 (patch) | |
| tree | 73352e313399cfe548af0428926847a221ed8ea1 | |
| parent | d9f21245adccdc3b85860aef97b68a3faf3f1884 (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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gem_prelude.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Tue Oct 28 10:42:50 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * gem_prelude.rb: considers --program-suffix and prefix configure + options. + + * lib/rubygems/defaults.rb: ditto. + Tue Oct 28 09:51:48 2008 NAKAMURA Usaku <usa@ruby-lang.org> * bootstraptest/test_thread.rb: ignore some exceptions. 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" diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index c894bf41be..315d12a484 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -21,7 +21,7 @@ module Gem File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] else - File.join(ConfigMap[:libdir], ruby_engine, 'gems', + File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', ConfigMap[:ruby_version]) end end |