1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mkmf.rb: use configured libdir value

Browse Source 
* 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
This commit is contained in:
nobu 2012-10-12 05:10:43 +00:00
parent 1968892c0d
commit 1b4c99c057
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Fri Oct 12 05:25:00 2012 Zachary Scott <zzak@ruby-lang.org>
* lib/timeout.rb (timeout): * lib/timeout.rb (timeout):

6
lib/mkmf.rb
View File

@ -1633,7 +1633,7 @@ SRC
idir = with_config(target + "-include", idefault) idir = with_config(target + "-include", idefault)
$arg_config.last[1] ||= "${#{target}-dir}/include" $arg_config.last[1] ||= "${#{target}-dir}/include"
ldir = with_config(target + "-lib", ldefault) 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) : [] idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
if defaults if defaults
@ -1650,7 +1650,7 @@ SRC
ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : [] ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
if defaults 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) ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
end end
$LIBPATH = ldirs | $LIBPATH $LIBPATH = ldirs | $LIBPATH
@ -2315,6 +2315,8 @@ site-install-rb: install-rb
$extout ||= nil $extout ||= nil
$extout_prefix ||= nil $extout_prefix ||= nil
@libdir_basename = config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] || "lib"
$arg_config.clear $arg_config.clear
dir_config("opt") dir_config("opt")
end end