From 6c0f2b097edabefd7ab8dfa1c36128de8febbe99 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 8 Dec 2009 07:16:49 +0000
Subject: * lib/rubygems/defaults.rb (Gem::default_dir): removed a clause  
 doing nothing.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/defaults.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib/rubygems')

diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 24314d8bf1..c9680104c7 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -20,13 +20,9 @@ module Gem
     if defined? RUBY_FRAMEWORK_VERSION then
       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
                 ConfigMap[:ruby_version]
-    elsif RUBY_VERSION >= '1.9.2' then
+    elsif ConfigMap[:rubylibprefix] then
       File.join(ConfigMap[:rubylibprefix], 'gems',
                 ConfigMap[:ruby_version])
-    # only Ruby 1.9.1 has a peculiar feature
-    elsif RUBY_VERSION > '1.9' and 
-      File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
-                ConfigMap[:ruby_version])
     else
       File.join(ConfigMap[:libdir], ruby_engine, 'gems',
                 ConfigMap[:ruby_version])
-- 
cgit v1.2.3