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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a287aef04f..26846857f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 16 11:18:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* file.c (rb_find_file_ext_safe, rb_find_file_safe): default to
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index d683599e50..9adaafc065 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1526,7 +1526,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
   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 @@ def dir_config(target, idefault=nil, ldefault=nil)
 
   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 @@ def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG)
   $extout ||= nil
   $extout_prefix ||= nil
 
+  @libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib"
+
   $arg_config.clear
   dir_config("opt")
 end
diff --git a/version.h b/version.h
index 5826293178..49b2043c83 100644
--- a/version.h
+++ b/version.h
@@ -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