diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-12 05:10:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-12 05:10:43 +0000 |
| commit | 1b4c99c0573719871ffa6491a3873adcff920c52 (patch) | |
| tree | ff422b96473dbb5408ea0b13217a5cbb44cbb722 /lib/mkmf.rb | |
| parent | 1968892c0d38b8d03b7710b94cbbcc4798b76f87 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 6 |
1 files changed, 4 insertions, 2 deletions
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 |