From 164cac90af000c7c454293d1cb6dfd25d362f54a Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 7 Jan 2009 08:13:07 +0000 Subject: * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir): use version invariant configuration. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/defaults.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib') 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