diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-03-04 04:24:26 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-03-04 04:24:26 +0000 |
| commit | 40aa4ce487b89f2d63decf2b552ca2aff0ec9957 (patch) | |
| tree | a47384a76741fd8f8629159422c9d157a34b037f /ext/extmk.rb.in | |
| parent | ee5ac1b30b8e731347829dcab3a1a228bd1126e5 (diff) | |
* ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where
--with-xx-{include,lib} is ignored when --with-xx-dir is
specified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb.in')
| -rw-r--r-- | ext/extmk.rb.in | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index dd9b51dbfd..94f4ea657b 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -338,21 +338,13 @@ def create_header() end def dir_config(target, idefault=nil, ldefault=nil) - if idefault && ldefault == nil - default = idefault - idefault = default + "/include" - ldefault = default + "/lib" + if dir = with_config(target + "-dir", (idefault unless ldefault)) + idefault = dir + "/include" + ldefault = dir + "/lib" end - dir = with_config(target + "-dir", default) - - idir, ldir = if dir then [ - dir + "/include", - dir + "/lib" - ] else [ - with_config(target + "-include", idefault), - with_config(target + "-lib", ldefault) - ] end + idir = with_config(target + "-include", idefault) + ldir = with_config(target + "-lib", ldefault) if idir idircflag = "-I" + idir |