* instruby.rb (install_recursive): skip backup files.

* instruby.rb (ext-comm): install only current platform headers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 3 deletions

diff --git a/instruby.rb b/instruby.rb
index 52f81af4d5..d813d0fdd7 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -126,9 +126,8 @@ def install_recursive(srcdir, dest, options = {})
   noinst = options.delete(:no_install)
   subpath = srcdir.size..-1
   Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src|
-    next if /\A\.{1,2}\z/ =~ (base = File.basename(src))
+    next if /\A\.{1,2}\z|\A\.\#|\A\#.*\#\z|~\z/ =~ (base = File.basename(src))
     if noinst
-      base = File.basename(src)
       if Array === noinst
         next if noinst.any? {|n| File.fnmatch?(n, base)}
       else
@@ -221,7 +220,7 @@ if $extout
     puts "installing extension scripts"
     makedirs [rubylibdir, sitelibdir]
     install_recursive("#{extout}/common", rubylibdir)
-    install_recursive("#{extout}/include", rubyhdrdir)
+    install_recursive("#{extout}/include/ruby", rubyhdrdir + "/ruby")
   end
 end