Fix Makefile.comm bug reported by Chris Sutcliffe.

diff --git a/ChangeLog b/ChangeLog
index 4006522..164fffa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-15  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       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  <keithmarshall@users.sourceforge.net>
 
        Initial import of mingw-dist module.

diff --git a/Makefile.comm.in b/Makefile.comm.in
index 3da503d..3f4ac16 100644 (file)
--- a/Makefile.comm.in
+++ b/Makefile.comm.in
@@ -41,7 +41,7 @@ all: update all-distfiles
 # LZMA compressed format for upload to the repository server.
 #
 Makefile.sub: ${srcdir}/*.xml
-       echo 'auto-distfiles = \\' > $@
+       echo "auto-distfiles = \\" > $@
        for file in $^; do echo "$$file.lzma \\" | sed 's,.*/,  ,' >> $@; done
        echo '  $$(EXTRA_DISTFILES)' >> $@
 
@@ -49,7 +49,7 @@ include Makefile.sub
 all-distfiles: $(DISTFILES) $(auto-distfiles)
 
 # Distributed manifests are serialised by incorporating a date-stamped
-# issue number, of the form YYMMDDNN; we track issue numbers using the
+# 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).
 #
@@ -85,7 +85,7 @@ PAD = "  "
        test $$issue -lt $${mark="`date -u +%Y%m%d`00"} && \
          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 "s/@$(issue_number)@/$$issue/" $< | lzma -c > $@
        sed -n 's/^$(TAB)*$$/break/;1,/^$(TAB)*[^#]/d;/^$(TAB)*#/p' \
          $(issue_log) >> issue.new
        rm -f $(issue_log) issue.tmp

diff --git a/Makefile.in b/Makefile.in
index f939423..f93ce60 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,7 +25,7 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
-all: @mingw_ac_subdirs@
+update all-distfiles: @mingw_ac_subdirs@
 
 @mingw_ac_subdirs@: FORCE
        @if test -r $@/Makefile; then \