From f69f6f52ff86e8ca736f1f5ade03bda606cd8915 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 16 Oct 2005 13:17:43 +0000 Subject: * ext/extmk.rb: omit non-existing directories. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/extmk.rb | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa3ec350d..846d40372 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 16 22:16:51 2005 Nobuyoshi Nakada + + * ext/extmk.rb: omit non-existing directories. + Sun Oct 16 14:30:05 2005 Masatoshi SEKI * lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash diff --git a/ext/extmk.rb b/ext/extmk.rb index 26651195a..5d85d2d97 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -350,12 +350,15 @@ end unless $extstatic ext_prefix = "#{$top_srcdir}/ext" exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t} -exts |= $extension if $extension -exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d| - d = File.dirname(d) - d.slice!(0, ext_prefix.length + 1) - d -}.sort unless $extension +if $extension + exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")} +else + exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d| + d = File.dirname(d) + d.slice!(0, ext_prefix.length + 1) + d + }.sort +end if $extout Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir)) -- cgit