kosaki	2012-01-03 13:48:34 +0900 (Tue, 03 Jan 2012)

  New Revision: 34195

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34195

  Log:
    merge revision(s) 33566:
    
    * tool/rbinstall.rb (install_recursive, bin-comm): split mere
      string not path name.  [ruby-core:40462] [Bug #5492]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/tool/rbinstall.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34194)
+++ ruby_1_9_3/ChangeLog	(revision 34195)
@@ -1,3 +1,8 @@
+Mon Jan  2 23:47:58 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/rbinstall.rb (install_recursive, bin-comm): split mere
+	  string not path name.  [ruby-core:40462] [Bug #5492]
+
 Mon Jan  2 23:41:57 2012  Tajima Akil <artonx@y...>
 
 	* win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34194)
+++ ruby_1_9_3/version.h	(revision 34195)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 15
+#define RUBY_PATCHLEVEL 16
 
 #define RUBY_RELEASE_DATE "2012-01-03"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/tool/rbinstall.rb
===================================================================
--- ruby_1_9_3/tool/rbinstall.rb	(revision 34194)
+++ ruby_1_9_3/tool/rbinstall.rb	(revision 34195)
@@ -239,7 +239,7 @@
     if dir
       makedirs(d)
     else
-      makedirs(File.dirname(d))
+      makedirs(d[/.*(?=\/)/m])
       if block_given?
         yield src, d, opts
       else
@@ -441,7 +441,7 @@
     trans = proc {|base| base}
   end
   install_recursive(File.join(srcdir, "bin"), bindir) do |src, cmd|
-    cmd = File.join(File.dirname(cmd), RbConfig.expand(trans[File.basename(cmd)]))
+    cmd = cmd.sub(/[^\/]*\z/m) {|n| RbConfig.expand(trans[n])}
 
     shebang = ''
     body = ''

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/