|
From: Keith M. <kei...@us...> - 2010-06-15 20:06:45
|
Update of /cvsroot/mingw/mingw-dist In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28849 Modified Files: ChangeLog Makefile.comm.in Makefile.in Log Message: Fix Makefile.comm bug reported by Chris Sutcliffe. Index: Makefile.in =================================================================== RCS file: /cvsroot/mingw/mingw-dist/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 4 May 2010 19:32:31 -0000 1.1 --- Makefile.in 15 Jun 2010 20:06:37 -0000 1.2 *************** *** 26,30 **** # arising from the use of this software. # ! all: @mingw_ac_subdirs@ @mingw_ac_subdirs@: FORCE --- 26,30 ---- # arising from the use of this software. # ! update all-distfiles: @mingw_ac_subdirs@ @mingw_ac_subdirs@: FORCE Index: Makefile.comm.in =================================================================== RCS file: /cvsroot/mingw/mingw-dist/Makefile.comm.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.comm.in 4 May 2010 19:32:31 -0000 1.1 --- Makefile.comm.in 15 Jun 2010 20:06:37 -0000 1.2 *************** *** 42,46 **** # Makefile.sub: ${srcdir}/*.xml ! echo 'auto-distfiles = \\' > $@ for file in $^; do echo "$$file.lzma \\" | sed 's,.*/, ,' >> $@; done echo ' $$(EXTRA_DISTFILES)' >> $@ --- 42,46 ---- # Makefile.sub: ${srcdir}/*.xml ! echo "auto-distfiles = \\" > $@ for file in $^; do echo "$$file.lzma \\" | sed 's,.*/, ,' >> $@; done echo ' $$(EXTRA_DISTFILES)' >> $@ *************** *** 50,54 **** # Distributed manifests are serialised by incorporating a date-stamped ! # issue number, of the form YYMMDDNN; we track issue numbers using the # issue.log file, (which we keep in CVS to ensure that all maintainers # can share a common issue number registry). --- 50,54 ---- # Distributed manifests are serialised by incorporating a date-stamped ! # issue number, of the form YYYYMMDDNN; we track issue numbers using the # issue.log file, (which we keep in CVS to ensure that all maintainers # can share a common issue number registry). *************** *** 86,90 **** issue=$$mark || issue=`expr $$issue + 1`; \ sed "s/^\($(TAB)*$*.xml:\).*/\1$$issue/" issue.tmp | sort >> issue.new; \ ! sed "s/@$(serial_number)@/$$issue/" $< | lzma -c > $@ sed -n 's/^$(TAB)*$$/break/;1,/^$(TAB)*[^#]/d;/^$(TAB)*#/p' \ $(issue_log) >> issue.new --- 86,90 ---- issue=$$mark || issue=`expr $$issue + 1`; \ sed "s/^\($(TAB)*$*.xml:\).*/\1$$issue/" issue.tmp | sort >> issue.new; \ ! sed "s/@$(issue_number)@/$$issue/" $< | lzma -c > $@ sed -n 's/^$(TAB)*$$/break/;1,/^$(TAB)*[^#]/d;/^$(TAB)*#/p' \ $(issue_log) >> issue.new Index: ChangeLog =================================================================== RCS file: /cvsroot/mingw/mingw-dist/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ChangeLog 4 May 2010 19:32:31 -0000 1.1 --- ChangeLog 15 Jun 2010 20:06:37 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + 2010-06-15 Keith Marshall <kei...@us...> + + Fix Makefile.comm bug reported by Chris Sutcliffe. + + * Makefile.in: Itemise standard sub-make goals as top-level defaults. + + * Makefile.com.in (Makefile.sub): Use double quotes in preference to + single, to avoid shell portability issue with quoted escapes. + (serial_number): Replace use of unintentionally undefined macro... + (issue_number): ...with this defined one. + 2010-05-04 Keith Marshall <kei...@us...> |