diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-13 02:21:25 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-13 02:21:25 +0000 |
| commit | b0863ef1b6955e8f7f07820aa3857f1483197e4d (patch) | |
| tree | 57b61ce2b94a27458ec2de3a90a0335e8e784f9b | |
| parent | 1090420be6b37e2218b2d113ff1c6265514bbbb1 (diff) | |
| download | ruby-b0863ef1b6955e8f7f07820aa3857f1483197e4d.tar.gz ruby-b0863ef1b6955e8f7f07820aa3857f1483197e4d.tar.xz ruby-b0863ef1b6955e8f7f07820aa3857f1483197e4d.zip | |
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | enc/depend | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 12 |
3 files changed, 14 insertions, 7 deletions
@@ -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 3b2ef9715..71cadde38 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 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 |