diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jan 7 17:13:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir): + use version invariant configuration. + Thu Jan 8 00:31:58 2009 Tanaka Akira <akr@fsij.org> * lib/test/unit/assertions.rb (assert_no_match): don't count up as two diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index 7884fad83d..995b81e1b2 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -20,12 +20,8 @@ module Gem if defined? RUBY_FRAMEWORK_VERSION then File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] - elsif RUBY_VERSION > '1.9' then - File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', - ConfigMap[:ruby_version]) else - File.join(ConfigMap[:libdir], ruby_engine, 'gems', - ConfigMap[:ruby_version]) + ConfigMap[:sitelibdir].sub(%r'/site_ruby/(?=[^/]+)', '/gems/') end end |