diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:31:07 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:31:07 +0000 |
commit | 0b491586b2f647d4fd0daccce62f8731246a2a11 (patch) | |
tree | 8666798b00a7d047dd55f36378a2da77e5a78dc5 /lib | |
parent | b7ebcb6000649add1863a0f520b4b3d84753914f (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems/defaults.rb | 6 |
1 files changed, 1 insertions, 5 deletions
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 |