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

* lib/mkmf.rb (map_dir): should generate path including $top_srcdir.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-25 05:21:39 +00:00
parent f0a296074c
commit 73b8faf7b9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Dec 25 14:20:13 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/mkmf.rb (map_dir): should generate path including $top_srcdir.
Tue Dec 25 14:09:16 2007 James Edward Gray II <jeg2@ruby-lang.org>
* lib/csv.rb: Fixed test failures caused by changes to Ruby.

2
lib/mkmf.rb
View File

@ -152,7 +152,7 @@ if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/rub
$top_srcdir = $hdrdir
$arch_hdrdir = $hdrdir + "/$(arch)"
elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") and
File.exist?("#{CONFIG["EXTOUT"]}/include/#{CONFIG["arch"]}/ruby/config.h")
File.exist?("#{$top_srcdir}/#{CONFIG["EXTOUT"]}/include/#{CONFIG["arch"]}/ruby/config.h")
$topdir ||= RbConfig::CONFIG["topdir"]
$arch_hdrdir = "$(extout)/include/$(arch)"
else