yugui	2009-01-12 22:31:07 +0900 (Mon, 12 Jan 2009)

  New Revision: 21451

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

  Log:
    merges r21363 from trunk into ruby_1_9_1. But r21312 is not merged.
    * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir):
      use version invariant configuration.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/rubygems/defaults.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21450)
+++ ruby_1_9_1/ChangeLog	(revision 21451)
@@ -1,3 +1,8 @@
+Wed Jan  7 17:13:38 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir):
+	  use version invariant configuration.
+
 Thu Jan  8 00:31:58 2009  Tanaka Akira  <akr@f...>
 
 	* lib/test/unit/assertions.rb (assert_no_match): don't count up as two
Index: ruby_1_9_1/lib/rubygems/defaults.rb
===================================================================
--- ruby_1_9_1/lib/rubygems/defaults.rb	(revision 21450)
+++ ruby_1_9_1/lib/rubygems/defaults.rb	(revision 21451)
@@ -20,12 +20,8 @@
     if defined? RUBY_FRAMEWORK_VERSION then
       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
                 ConfigMap[:ruby_version]
-    elsif RUBY_VERSION > '1.9' then
-      File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
-                ConfigMap[:ruby_version])
     else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-                ConfigMap[:ruby_version])
+      ConfigMap[:sitelibdir].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
     end
   end
 

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