usa	2013-01-15 16:03:47 +0900 (Tue, 15 Jan 2013)

  New Revision: 38828

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

  Log:
    merge revision(s) 38776: [Backport #7172]
    
    * tool/mkconfig.rb: use configured libdir value to fix
      --enable-load-relative on systems where libdir is not default value,
      overridden in config.site files.  [ruby-core:47267] [Bug #6903]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/tool/mkconfig.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38827)
+++ ruby_1_9_3/ChangeLog	(revision 38828)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Jan 15 16:03:30 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/mkconfig.rb: use configured libdir value to fix
+	  --enable-load-relative on systems where libdir is not default value,
+	  overridden in config.site files.  [ruby-core:47267] [Bug #6903]
+
 Tue Jan 15 15:55:09 2013  Eric Hodel  <drbrain@s...>
 
 	* object.c (Init_Object):  Added RDoc location pointers for
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38827)
+++ ruby_1_9_3/version.h	(revision 38828)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 368
+#define RUBY_PATCHLEVEL 369
 
 #define RUBY_RELEASE_DATE "2013-01-15"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/tool/mkconfig.rb
===================================================================
--- ruby_1_9_3/tool/mkconfig.rb	(revision 38827)
+++ ruby_1_9_3/tool/mkconfig.rb	(revision 38828)
@@ -39,6 +39,7 @@ win32 = /mswin/ =~ arch https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/tool/mkconfig.rb#L39
 universal = /universal.*darwin/ =~ arch
 v_fast = []
 v_others = []
+v_runtime = {}
 vars = {}
 continued_name = nil
 continued_line = nil
@@ -114,6 +115,8 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/tool/mkconfig.rb#L115
     if name == "configure_args"
       val.gsub!(/ +(?!-)/, "=") if win32
       val.gsub!(/--with-out-ext/, "--without-ext")
+    elsif name == "libdir"
+      v_runtime[:libdir] = val[/\$(\(exec_prefix\)|\{exec_prefix\})\/(.*)/, 2]
     end
     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
     case name
@@ -145,7 +148,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/tool/mkconfig.rb#L148
 
 drive = File::PATH_SEPARATOR == ';'
 
-prefix = "/lib/ruby/#{version}/#{arch}"
+prefix = "/#{v_runtime[:libdir] || 'lib'}/ruby/#{version}/#{arch}"
 print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
 print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
 print <<'ARCH' if universal

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r38776


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