summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-22 01:02:44 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-09-22 01:02:44 +0000
commit3e7de9238bd816ccd96b5ec28f3ff3667b2c6f88 (patch)
tree846c604e33399c20f9df4f213d798080d5f64556
parentaf86fe1e791c16f25e8e117e6c2db7c38dfe8d95 (diff)
downloadruby-3e7de9238bd816ccd96b5ec28f3ff3667b2c6f88.tar.gz
ruby-3e7de9238bd816ccd96b5ec28f3ff3667b2c6f88.tar.xz
ruby-3e7de9238bd816ccd96b5ec28f3ff3667b2c6f88.zip
eban
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--lib/mkmf.rb12
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 39abcd6f2..cbdcb852e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +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.
+ * ext/extmk.rb, lib/mkmf.rb (install_rb): check whether libdir is
+ directory or not.
Thu Sep 21 17:23:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 47abd321b..37e06a3a1 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -129,11 +129,13 @@ def install_rb(mfile, dest, 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 == "."