diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-16 13:17:43 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-16 13:17:43 +0000 |
commit | 64a1809ce259945e3928a256bc47b38b8429148d (patch) | |
tree | 78d7e53d3253ad9027ac0094435951365755148d | |
parent | 898f094d8dc58ceafb1329784cc5c2c01f12f710 (diff) | |
download | ruby-64a1809ce259945e3928a256bc47b38b8429148d.tar.gz |
* ext/extmk.rb: omit non-existing directories.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/extmk.rb | 15 |
2 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Sun Oct 16 22:16:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: omit non-existing directories. + Sun Oct 16 14:40:54 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash diff --git a/ext/extmk.rb b/ext/extmk.rb index fc1a2f37ce..334ddbcd12 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -351,12 +351,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)) |