From 0aaeb414326d10013313eebea7c465553c455147 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 24 Jul 2010 10:37:26 +0000 Subject: [PATCH] merges r28654 from trunk into ruby_1_9_2. -- * tool/rbinstall.rb (ext-arch): prune directories start with '-'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ tool/rbinstall.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f5c8ca8712..13059b0d95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jul 16 12:06:08 2010 Nobuyoshi Nakada + + * tool/rbinstall.rb (ext-arch): prune directories start with '-'. + Wed Jul 14 18:18:05 2010 NARUSE, Yui * regexec.c (match_at): add end point to enclen's argument. diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index adbe691cf9..f5586fe1f0 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -338,7 +338,7 @@ end install?(:ext, :arch, :'ext-arch') do prepare "extension objects", archlibdir - noinst = %w[-*] | (CONFIG["no_install_files"] || "").split + noinst = %w[-* -*/] | (CONFIG["no_install_files"] || "").split install_recursive("#{$extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode, :strip => $strip) prepare "extension objects", sitearchlibdir prepare "extension objects", vendorarchlibdir