diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 05:21:39 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-25 05:21:39 +0000 |
| commit | 5ad33be825071e6bb0de65be42eecda5b3289563 (patch) | |
| tree | 7637416c745afb4ada8e5700624513eb4790674a | |
| parent | 508bcdb44c4f530e81254eb41647fcb60bd732c5 (diff) | |
| download | ruby-5ad33be825071e6bb0de65be42eecda5b3289563.tar.gz ruby-5ad33be825071e6bb0de65be42eecda5b3289563.tar.xz ruby-5ad33be825071e6bb0de65be42eecda5b3289563.zip | |
* lib/mkmf.rb (map_dir): should generate path including $top_srcdir.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 2038f5f4c..bb583c9ad 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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 |