diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-21 10:08:57 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-09-21 10:08:57 +0000 |
| commit | ca13525d5d52113e1ba0bb1711ab17a5215466be (patch) | |
| tree | a39a76034fd5f98839ddbc88feaf72e49f657d14 | |
| parent | b35df6aae27214f831931c0174afb497218cf74e (diff) | |
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 12 | ||||
| -rw-r--r-- | lib/find.rb | 2 |
3 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Thu Sep 21 19:04:34 2000 WATANABE Hirofumi <eban@os.rim.or.jp> + + * ext/extmk.rb (install_rb): check whether libdir is directory or not. + Thu Sep 21 17:23:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org> * file.c (rb_file_s_symlink): use HAVE_SYMLINK. diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 59536c4944..becabfc7c6 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -145,11 +145,13 @@ def install_rb(mfile, srcdir = nil) libdir = srcdir + "/" + libdir if srcdir path = [] dir = [] - Find.find(libdir) do |f| - next unless /\.rb$/ =~ f - f = f[libdir.length+1..-1] - path.push f - dir |= File.dirname(f) + if File.directory? libdir + Find.find(libdir) do |f| + next unless /\.rb$/ =~ f + f = f[libdir.length+1..-1] + path.push f + dir |= File.dirname(f) + end end for f in dir next if f == "." diff --git a/lib/find.rb b/lib/find.rb index a8dcea4f71..ce3e7068c3 100644 --- a/lib/find.rb +++ b/lib/find.rb @@ -9,9 +9,11 @@ module Find def find(*path) +p ["find", path] while file = path.shift catch(:prune) { yield file +p ["find", file] if File.lstat(file).directory? then d = Dir.open(file) begin |