From 5d8bff6d904685f9c317cd04c5b6ae07165c02fb Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 28 Jun 2009 10:08:36 +0000
Subject: * lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry

* lib/rubygems/defaults.rb (Gem.default_dir): considers
  "--with-rubylibprefix" configure option.

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

(limited to 'lib/rubygems')

diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 997f073835..24314d8bf1 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -20,8 +20,11 @@ module Gem
     if defined? RUBY_FRAMEWORK_VERSION then
       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
                 ConfigMap[:ruby_version]
-    # 1.9.2dev reverted to 1.8 style path
-    elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2' then
+    elsif RUBY_VERSION >= '1.9.2' 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
-- 
cgit v1.2.3