nobu	2012-10-12 14:10:43 +0900 (Fri, 12 Oct 2012)

  New Revision: 37153

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

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

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37152)
+++ ChangeLog	(revision 37153)
@@ -1,3 +1,8 @@
+Fri Oct 12 14:10:41 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]
+
 Fri Oct 12 05:25:00 2012  Zachary Scott	<zzak@r...>
 
 	* lib/timeout.rb (timeout):
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 37152)
+++ lib/mkmf.rb	(revision 37153)
@@ -1633,7 +1633,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
@@ -1650,7 +1650,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
@@ -2315,6 +2315,8 @@
     $extout ||= nil
     $extout_prefix ||= nil
 
+    @libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib"
+
     $arg_config.clear
     dir_config("opt")
   end

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