summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/extmk.rb.in18
1 files changed, 5 insertions, 13 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 1ff6fe543..b7db0a31e 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -333,21 +333,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