naruse	2009-08-26 19:56:55 +0900 (Wed, 26 Aug 2009)

  New Revision: 24671

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

  Log:
    * tool/mkconfig.rb (program_transform_name): fix for multiple trans
      rules for autoconf 2.61 or earlier.
    * tool/rbinstall.rb (program_transform_name): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/tool/mkconfig.rb
    trunk/tool/rbinstall.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24670)
+++ ChangeLog	(revision 24671)
@@ -1,3 +1,10 @@
+Wed Aug 26 19:51:13 2009  NARUSE, Yui  <naruse@r...>
+
+	* tool/mkconfig.rb (program_transform_name): fix for multiple trans
+	  rules for autoconf 2.61 or earlier.
+
+	* tool/rbinstall.rb (program_transform_name): ditto.
+
 Wed Aug 26 19:20:26 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* random.c (random_rand): unified random_int and random_float.
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 24670)
+++ tool/rbinstall.rb	(revision 24671)
@@ -384,7 +384,7 @@
   if trans = CONFIG["program_transform_name"]
     exp = []
     trans.gsub!(/\$\$/, '$')
-    trans.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do
+    trans.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:(?!\3)(?:\\.|.))*)\3((?:(?!\3)(?:\\.|.))*)\3([gi]*)]) do
       |addr, cmd, sep, pat, rep, opt|
       addr &&= Regexp.new(addr[/\A\/(.*)\/\z/, 1])
       case cmd
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 24670)
+++ tool/mkconfig.rb	(revision 24671)
@@ -92,7 +92,7 @@
       unless $install_name
         $install_name = "ruby"
         val.gsub!(/\$\$/, '$')
-        val.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do
+        val.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\\?\W)((?:(?!\3)(?:\\.|.))*)\3((?:(?!\3)(?:\\.|.))*)\3([gi]*)]) do
           |addr, cmd, sep, pat, rep, opt|
           if addr
             Regexp.new(addr[/\A\/(.*)\/\z/, 1]) =~ $install_name or next

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