From f6628871b5d7d1b237dfebcee09b4c304ed6d1d9 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 13 Feb 2008 02:21:25 +0000
Subject: [PATCH] 	* enc/depend: fix typo.

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



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  7 +++++++
 enc/depend  |  2 +-
 lib/mkmf.rb | 12 ++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59877d245c..1ba22ff3c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 13 11:20:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@segment7.net>
 
 	* lib/rdoc/markup/inline.rb:  Allow inline markup to have a leading
diff --git a/enc/depend b/enc/depend
index 3b2ef97158..71cadde38a 100644
--- a/enc/depend
+++ b/enc/depend
@@ -46,7 +46,7 @@ $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
 	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|
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 9629a648ab..45bf90872d 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1512,10 +1512,10 @@ static:		$(STATIC_LIB)#{$extout ? " install-rb" : ""}
         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 @@ static:		$(STATIC_LIB)#{$extout ? " install-rb" : ""}
 	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