From e4ac7a1760f27b4cbb7a1bc017cd9c610510ceef Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 13 Feb 2008 07:26:52 +0000
Subject: * lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse
   escapes. [ruby-dev:33726]

* bootstraptest/test_method.rb enc/depend instruby.rb lib/mkmf.rb
  mkconfig.rb: revert r15443. ditto.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/depend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'enc/depend')

diff --git a/enc/depend b/enc/depend
index 71cadde38..d97c9056c 100644
--- a/enc/depend
+++ b/enc/depend
@@ -46,12 +46,12 @@ $(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):/, "\\&enc/#{e.sub(/[^\/]+\z/, '')}")%>
+	<%=link_so.sub(/\$\(OBJS\)/) {obj}.sub(/\$\(DEFFILE\)/) {df}.gsub(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}%>
 
 % end
 % dependencies.each do |e|
 enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c
-	<%=COMPILE_C.sub(/\$\(<(?:.*)\)/, "$(srcdir)/enc/#{e}.c")%>
+	<%=COMPILE_C.sub(/\$\(<(?:.*)\)/) {"$(srcdir)/enc/#{e}.c"}%>
 % end
 
 clean:
-- 
cgit