usa	2008-02-13 11:21:25 +0900 (Wed, 13 Feb 2008)

  New Revision: 15455

  Modified files:
    trunk/ChangeLog
    trunk/enc/depend
    trunk/lib/mkmf.rb

  Log:
    * enc/depend: fix typo.
    
    * lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
      with "\\".
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15455&r2=15454&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=15455&r2=15454&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/depend?r1=15455&r2=15454&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15454)
+++ ChangeLog	(revision 15455)
@@ -1,3 +1,10 @@
+Wed Feb 13 11:20:26 2008  NAKAMURA Usaku  <usa@r...>
+
+	* enc/depend: fix typo.
+
+	* lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
+	  with "\\".
+
 Wed Feb 13 08:57:21 2008  Eric Hodel  <drbrain@s...>
 
 	* lib/rdoc/markup/inline.rb:  Allow inline markup to have a leading
Index: enc/depend
===================================================================
--- enc/depend	(revision 15454)
+++ enc/depend	(revision 15455)
@@ -46,7 +46,7 @@
 	echo EXPORTS > <%=df%>
 	echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%>
 %   end
-	<%=link_so.sub(/\$\(OBJS\)/, obj).sub(/\$\(DEFFILE\)/, df.to_s).gsub(/-(?:implib|pdb):/, "\\1enc/#{e.sub(/[^\/]+\z/, '')}")%>
+	<%=link_so.sub(/\$\(OBJS\)/, obj).sub(/\$\(DEFFILE\)/, df.to_s).gsub(/-(?:implib|pdb):/, "\\&enc/#{e.sub(/[^\/]+\z/, '')}")%>
 
 % end
 % dependencies.each do |e|
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 15454)
+++ lib/mkmf.rb	(revision 15455)
@@ -1512,10 +1512,10 @@
         f.gsub!("/", sep)
         dir.gsub!("/", sep)
         sep = ":/="+sep
-        f.gsub!(/(\$\(\w+)(\))/, "\\1#{sep}\\2")
-        f.gsub!(/(\$\{\w+)(\})/, "\\1#{sep}\\2")
-        dir.gsub!(/(\$\(\w+)(\))/, "\\1#{sep}\\2")
-        dir.gsub!(/(\$\{\w+)(\})/, "\\1#{sep}\\2")
+        f.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+        f.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
+        dir.gsub!(/(\$\(\w+)(\))/) {$1+sep+$2}
+        dir.gsub!(/(\$\{\w+)(\})/) {$1+sep+$2}
       end
       mfile.print "\t$(INSTALL_PROG) #{f} #{dir}\n"
       if defined?($installed_list)
@@ -1546,8 +1546,8 @@
 	if sep
 	  f = f.gsub("/", sep)
 	  sep = ":/="+sep
-	  f = f.gsub(/(\$\(\w+)(\))/, "\\1#{sep}\\2")
-	  f = f.gsub(/(\$\{\w+)(\})/, "\\1#{sep}\\2")
+	  f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
+	  f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
 	else
 	  sep = ""
 	end

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