diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-24 10:37:26 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-24 10:37:26 +0000 |
| commit | 0aaeb414326d10013313eebea7c465553c455147 (patch) | |
| tree | 711d158e6096f7041c06bf7277d0298929e28c19 | |
| parent | 25380b0a57d5c5442fedefe6be7f025ace5bd1b5 (diff) | |
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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Jul 16 12:06:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/rbinstall.rb (ext-arch): prune directories start with '-'. + Wed Jul 14 18:18:05 2010 NARUSE, Yui <naruse@ruby-lang.org> * 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 |