summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-07 08:13:07 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-07 08:13:07 +0000
commitf597d65a6f11b9ec8d3d55c81104dc6967d7f44e (patch)
tree1487c9e4031d776d98f727b208d26333da82d6b4 /lib
parent99f0026927cf21727930a9bb9627b9cd43028b43 (diff)
* instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir):
use version invariant configuration. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rubygems/defaults.rb6
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