diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-05 08:50:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-05 08:50:21 +0000 |
| commit | ef35c1fd1226328a3ca2547519b8891e3f888d1b (patch) | |
| tree | 542b675cd0138eadddada7fe2d01b39f14ec990d | |
| parent | 089cdb63204ba37a66c3e0907d2dbbacd40bb07d (diff) | |
| download | ruby-ef35c1fd1226328a3ca2547519b8891e3f888d1b.tar.gz ruby-ef35c1fd1226328a3ca2547519b8891e3f888d1b.tar.xz ruby-ef35c1fd1226328a3ca2547519b8891e3f888d1b.zip | |
* ext/extmk.rb (extmake): set $0 temporarily while loading
extconf.rb.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 24 |
2 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sun Jan 5 17:44:37 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * ext/extmk.rb (extmake): set $0 temporarily while loading + extconf.rb. + Sun Jan 5 14:46:46 2003 WATANABE Hirofumi <eban@ruby-lang.org> * instruby.rb: need paren in regexp(make -n install). diff --git a/ext/extmk.rb b/ext/extmk.rb index 1280daf11..f8e983ebf 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -66,14 +66,21 @@ def extmake(target) $defs = [] Logging::logfile 'mkmf.log' Config::CONFIG["srcdir"] = $srcdir - if File.exist?("#{$srcdir}/makefile.rb") - load "#{$srcdir}/makefile.rb" - elsif File.exist?("#{$srcdir}/extconf.rb") - load "#{$srcdir}/extconf.rb" - else - create_makefile(target) + begin + if File.exist?($0 = "#{$srcdir}/makefile.rb") + load $0 + elsif File.exist?($0 = "#{$srcdir}/extconf.rb") + load $0 + else + create_makefile(target) + end + rescue SystemExit + # ignore + ensure + rm_f "conftest*" + $0 = __FILE__ + Config::CONFIG["srcdir"] = $top_srcdir end - Config::CONFIG["srcdir"] = $top_srcdir end end if File.exist?("./Makefile") @@ -96,10 +103,7 @@ def extmake(target) $extlibs += " " + $libs unless $libs == "" $extlibs += " " + $LOCAL_LIBS unless $LOCAL_LIBS == "" end - rescue SystemExit - # ignore ensure - rm_f "conftest*" Dir.chdir dir end true |