merges r28134 from trunk into ruby_1_9_2.

--
Allow bin/* install from dot-dirs. Fixes rvm and multiruby installations.

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

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f60b13f8fa..6557c8803a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  3 05:37:46 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs.
+	  Fixes rvm and multiruby installations.
+
 Thu Oct 27 09:57:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index f690911f5c..79aee2e476 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -404,7 +404,9 @@ install?(:local, :comm, :bin, :'bin-comm') do
   end
   for src in Dir[File.join(srcdir, "bin/*")]
     next unless File.file?(src)
-    next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
+    s = src.downcase
+    next if %w(old bak orig rej diff patch core).include? File.extname(s)
+    next if /^\.\#|(~|core)$/i =~ File.basename(s)
 
     name = RbConfig.expand(trans[File.basename(src)])
 
diff --git a/version.h b/version.h
index 4e38487086..d45fbf7a29 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 317
+#define RUBY_PATCHLEVEL 318
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1