yugui	2008-10-28 10:43:55 +0900 (Tue, 28 Oct 2008)

  New Revision: 19975

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

  Log:
    * gem_prelude.rb: considers --program-suffix and prefix configure
      options.
    
    * lib/rubygems/defaults.rb: ditto.

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 19974)
+++ ruby_1_9_1/ChangeLog	(revision 19975)
@@ -1,3 +1,10 @@
+Tue Oct 28 10:42:50 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* gem_prelude.rb: considers --program-suffix and prefix configure
+	  options.
+
+	* lib/rubygems/defaults.rb: ditto.
+
 Tue Oct 28 09:51:48 2008  NAKAMURA Usaku  <usa@r...>
 
 	* bootstraptest/test_thread.rb: ignore some exceptions.
Index: ruby_1_9_1/gem_prelude.rb
===================================================================
--- ruby_1_9_1/gem_prelude.rb	(revision 19974)
+++ ruby_1_9_1/gem_prelude.rb	(revision 19975)
@@ -113,7 +113,7 @@
           undef_method :gem if method_defined? :gem
         end
 
-        $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
+        $".delete File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name], 
                             Gem::ConfigMap[:ruby_version], 'rubygems.rb')
 
         require 'rubygems'
@@ -230,7 +230,7 @@
 
   begin
     Gem.push_all_highest_version_gems_on_load_path
-    $" << File.join(Gem::ConfigMap[:libdir], "ruby",
+    $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
                     Gem::ConfigMap[:ruby_version], "rubygems.rb")
   rescue Exception => e
     puts "Error loading gem paths on load path in gem_prelude"
Index: ruby_1_9_1/lib/rubygems/defaults.rb
===================================================================
--- ruby_1_9_1/lib/rubygems/defaults.rb	(revision 19974)
+++ ruby_1_9_1/lib/rubygems/defaults.rb	(revision 19975)
@@ -21,7 +21,7 @@
       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
                 ConfigMap[:ruby_version]
     else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+      File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
                 ConfigMap[:ruby_version])
     end
   end

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