aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-03 00:52:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-03 00:52:10 +0000
commit1184dd33d5030410e93b74ccafaec694be98530d (patch)
treefb403d4e1cc1f1842cccda76b8bef992ab1a2771 /lib
parent40daca4a87d4e7177a1fce943f09b793582bb50d (diff)
downloadruby-1184dd33d5030410e93b74ccafaec694be98530d.tar.gz
* lib/mkmf.rb ($topdir): use compile_dir only when not installed yet.
[ruby-talk:94098] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 92fc97d726..c6180282ec 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -77,16 +77,11 @@ def map_dir(dir, map = nil)
map.inject(dir) {|dir, (orig, new)| dir.gsub(orig, new)}
end
-if not $extmk and File.exist? Config::CONFIG["archdir"] + "/ruby.h"
- $hdrdir = $archdir
-elsif File.exist? $srcdir + "/ruby.h"
+if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h")
+ $topdir = $hdrdir = $archdir
+elsif File.exist?($srcdir + "/ruby.h") and
+ File.exist?((compile_dir = Config::CONFIG['compile_dir']) + "/config.h")
$hdrdir = $srcdir
-else
- abort "can't find header files for ruby."
-end
-if File.exist?($hdrdir + "/config.h")
- $topdir = $hdrdir
-elsif File.exist?((compile_dir = Config::CONFIG['compile_dir']) + "/config.h")
$topdir = compile_dir
else
abort "can't find header files for ruby."