diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-26 14:03:38 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-26 14:03:38 +0000 |
| commit | 3da1f24e1e02fbbdd32305299d871a34fe3d54c8 (patch) | |
| tree | 1eb139667efd35e14d7f7a420df33d1a19b8921e /lib | |
| parent | fb82ba2f1c706c4e4a7ab9e359d084704d745f1a (diff) | |
merge revision(s) 41648: [Backport #8115]
* lib/mkmf.rb: should use expanded values for header directories
unless extmk. patch by vo.x (Vit Ondruch) at [ruby-core:55653]
[Bug #8115], rhbz#921650.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ee89198143..d4d5846bfc 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -225,11 +225,10 @@ module MakeMakefile path = dir end $extmk ||= false - if not $extmk and File.exist?(RbConfig::CONFIG["rubyhdrdir"] + "/ruby/ruby.h") - $hdrdir = CONFIG["rubyhdrdir"] + if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") $topdir = $hdrdir $top_srcdir = $hdrdir - $arch_hdrdir = CONFIG["rubyarchhdrdir"] + $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"] elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") $topdir ||= RbConfig::CONFIG["topdir"] $arch_hdrdir = "$(extout)/include/$(arch)" |