From 4a84362e4bc3ff8d92ae461315fcbc5e1d8fc401 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 12 Jan 2009 13:31:07 +0000 Subject: merges r21363 from trunk into ruby_1_9_1. But r21312 is not merged. * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir): use version invariant configuration. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/rubygems/defaults.rb | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8e5b953d..e4de2b7c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 7 17:13:38 2009 Nobuyoshi Nakada + + * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir): + use version invariant configuration. + Thu Jan 8 00:31:58 2009 Tanaka Akira * 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 7884fad83..995b81e1b 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 -- cgit