diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Oct 12 14:10:41 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] + Fri Oct 12 05:25:00 2012 Zachary Scott <zzak@ruby-lang.org> * lib/timeout.rb (timeout): diff --git a/lib/mkmf.rb b/lib/mkmf.rb index b77e7da231..0996392300 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1633,7 +1633,7 @@ SRC 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 @@ SRC 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 @@ site-install-rb: install-rb $extout ||= nil $extout_prefix ||= nil + @libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib" + $arg_config.clear dir_config("opt") end |