yugui	2009-06-29 01:22:14 +0900 (Mon, 29 Jun 2009)

  New Revision: 23885

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

  Log:
    * gem_prelude.c (Gem.default_dir): follows the change on 
      lib/rubygems/default.rb in r23879

  Modified files:
    trunk/ChangeLog
    trunk/gem_prelude.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23884)
+++ ChangeLog	(revision 23885)
@@ -1,3 +1,8 @@
+Sun Jun 28 23:10:55 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* gem_prelude.c (Gem.default_dir): follows the change on 
+	  lib/rubygems/default.rb in r23879
+
 Sun Jun 28 23:32:11 2009  Tadayoshi Funaba  <tadf@d...>
 
 	* complex.c (nucomp_div): raises ZeroDivisionError immediately
Index: gem_prelude.rb
===================================================================
--- gem_prelude.rb	(revision 23884)
+++ gem_prelude.rb	(revision 23885)
@@ -91,29 +91,32 @@
     end
 
     # begin rubygems/defaults
-  
+
     @post_install_hooks   ||= []
     @post_uninstall_hooks ||= []
     @pre_uninstall_hooks  ||= []
     @pre_install_hooks    ||= []
-  
+
     ##
     # An Array of the default sources that come with RubyGems
-  
+
     def self.default_sources
       %w[http://gems.rubyforge.org/]
     end
-  
+
     ##
     # Default home directory path to be used if an alternate value is not
     # specified in the environment
-  
+
     def self.default_dir
       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

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