usa	2012-10-16 11:19:25 +0900 (Tue, 16 Oct 2012)

  New Revision: 37211

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

  Log:
    merge revision(s) 37153: [Backport #6207]
    
    * lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
      default library path.  [ruby-core:43726] [Bug #6207]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/mkmf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37210)
+++ ruby_1_9_3/ChangeLog	(revision 37211)
@@ -1,3 +1,8 @@
+Tue Oct 16 11:18:06 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
+	  default library path.  [ruby-core:43726] [Bug #6207]
+
 Tue Oct 16 10:56:55 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (rb_find_file_ext_safe, rb_find_file_safe): default to
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 37210)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 37211)
@@ -1526,7 +1526,7 @@
   idir = with_config(target + "-include", idefault)
   $arg_config.last[1] ||= "${#{target}-dir}/include"
   ldir = with_config(target + "-lib", ldefault)
-  $arg_config.last[1] ||= "${#{target}-dir}/lib"
+  $arg_config.last[1] ||= "${#{target}-dir}/#{@libdir_basename}"
 
   idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
   if defaults
@@ -1543,7 +1543,7 @@
 
   ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
   if defaults
-    ldirs.concat(defaults.collect {|d| d + "/lib"})
+      ldirs.concat(defaults.collect {|d| "#{d}/#{@libdir_basename}"})
     ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
   end
   $LIBPATH = ldirs | $LIBPATH
@@ -2186,6 +2186,8 @@
   $extout ||= nil
   $extout_prefix ||= nil
 
+  @libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib"
+
   $arg_config.clear
   dir_config("opt")
 end
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37210)
+++ ruby_1_9_3/version.h	(revision 37211)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 295
+#define RUBY_PATCHLEVEL 296
 
 #define RUBY_RELEASE_DATE "2012-10-16"
 #define RUBY_RELEASE_YEAR 2012

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