yugui	2009-06-28 19:08:36 +0900 (Sun, 28 Jun 2009)

  New Revision: 23879

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23879

  Log:
    * lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry
    
    * lib/rubygems/defaults.rb (Gem.default_dir): considers
      "--with-rubylibprefix" configure option.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/defaults.rb
    trunk/lib/rubygems.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23878)
+++ ChangeLog	(revision 23879)
@@ -1,3 +1,10 @@
+Sun Jun 28 19:02:07 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry
+
+	* lib/rubygems/defaults.rb (Gem.default_dir): considers
+	  "--with-rubylibprefix" configure option.
+
 Sun Jun 28 09:21:00 2009  Tadayoshi Funaba  <tadf@d...>
 
 	* complex.c: renamed some static functions.
Index: lib/rubygems/defaults.rb
===================================================================
--- lib/rubygems/defaults.rb	(revision 23878)
+++ lib/rubygems/defaults.rb	(revision 23879)
@@ -20,8 +20,11 @@
     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
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 23878)
+++ lib/rubygems.rb	(revision 23879)
@@ -173,6 +173,7 @@
     :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"],

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/