From 779cc59c1c8b7a4f230c5cf5a00480423eaea2cb 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: http://svn.ruby-lang.org/repos/ruby/trunk@23879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems.rb          | 1 +
 lib/rubygems/defaults.rb | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index a4ce9b0a8..8e6d8c963 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -173,6 +173,7 @@ module Gem
     :bindir => RbConfig::CONFIG["bindir"],
     :datadir => RbConfig::CONFIG["datadir"],
     :libdir => RbConfig::CONFIG["libdir"],
+    :rubylibprefix => RbConfig::CONFIG["rubylibprefix"],
     :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
     :ruby_version => RbConfig::CONFIG["ruby_version"],
     :sitedir => RbConfig::CONFIG["sitedir"],
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 997f07383..24314d8bf 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