From: Keith M. <kei...@us...> - 2011-06-18 12:32:26
|
Update of /cvsroot/mingw/mingw-get In directory vz-cvs-4.sog:/tmp/cvs-serv11416 Modified Files: ChangeLog Makefile.in Log Message: Avoid accidental RCS keyword substitutions. Index: Makefile.in =================================================================== RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Makefile.in 18 Jun 2011 09:53:21 -0000 1.28 --- Makefile.in 18 Jun 2011 12:32:23 -0000 1.29 *************** *** 244,252 **** -e s,'^# *cut:',, $< > $@ # The following rule provides a mechanism for generating a composite from # README, INSTALL and NEWS, for use as an on-line package description. # readme.txt: gendoc.combined.sed readme.txt.tag readme.txt.in ! sed s,'$$Id$@.tag`", $@.in > $@ echo '$$Document: $@ $$: end of file' >> $@ rm -f gendoc.combined.sed $@.* --- 244,258 ---- -e s,'^# *cut:',, $< > $@ + # The following rules use sed and awk to match the RCS Id keyword; + # we define and use the following macro, in the form "$(DOLLAR)Id:", + # to avoid unwanted substitution on CVS checkout. + # + DOLLAR = $$ + # The following rule provides a mechanism for generating a composite from # README, INSTALL and NEWS, for use as an on-line package description. # readme.txt: gendoc.combined.sed readme.txt.tag readme.txt.in ! sed s,'$(DOLLAR)Id:.*',"`cat $@.tag`", $@.in > $@ echo '$$Document: $@ $$: end of file' >> $@ rm -f gendoc.combined.sed $@.* *************** *** 258,262 **** # readme.txt.tag: NEWS.in ! awk '/\$$Id$$2 = "readme.txt\\,v"; print }' $^ > $@ # The tag-line generated by the preceding rule may then be substituted, by --- 264,268 ---- # readme.txt.tag: NEWS.in ! awk '/\$(DOLLAR)Id:/{ $$2 = "readme.txt\\,v"; print }' $^ > $@ # The tag-line generated by the preceding rule may then be substituted, by Index: ChangeLog =================================================================== RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** ChangeLog 18 Jun 2011 09:59:34 -0000 1.108 --- ChangeLog 18 Jun 2011 12:32:23 -0000 1.109 *************** *** 1,4 **** --- 1,12 ---- 2011-06-18 Keith Marshall <kei...@us...> + Avoid accidental RCS keyword substitutions. + + * Makefile.in (DOLLAR): New macro; define it. + (readme.txt, readme.txt.in): Use it, where unexpanded RCS Id keyword + matching is intended. + + 2011-06-18 Keith Marshall <kei...@us...> + Mercurial support revisited. |