From b0863ef1b6955e8f7f07820aa3857f1483197e4d 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: 	* enc/depend: fix typo.

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



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 9629a648a..45bf90872 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
-- 
cgit