1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2004-03-03 00:52:10 +00:00
parent 40daca4a87
commit 1184dd33d5
2 changed files with 9 additions and 9 deletions

View file

@ -1,3 +1,8 @@
Wed Mar 3 09:52:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb ($topdir): use compile_dir only when not installed yet.
[ruby-talk:94098]
Wed Mar 3 01:18:52 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/converter.rb: handled Uconv::Error.

View file

@ -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."