Update readme.txt ID tag-line to track NEWS rather than README.

diff --git a/ChangeLog b/ChangeLog
index 496e680..36892cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-18  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Update readme.txt ID tag-line to track NEWS rather than README.
+
+       * Makefile.in (readme.txt.in): New rule; implement it.
+       (readme.txt.tag): Likewise; this implements the tag-line tracking.
+       (readme.txt): Rule redefined in terms of the preceding pair.
+
 2011-06-17  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        mingw-get-0.3-mingw32-alpha-2 released.

diff --git a/Makefile.in b/Makefile.in
index c18ce43..04794f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -246,15 +246,28 @@ NROFF = nroff -Tascii
 # 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: README.in NEWS.in INSTALL.in gendoc.combined.sed
+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 $@.*
+
+# There should be a new generation of readme.txt for each package release;
+# since each release should also include an updated NEWS file; we adopt the
+# ID tag-line from NEWS.in, as most the appropriate template for generation
+# of a corresponding tag-line for readme.in
+#
+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
+# the primary readme.txt generation rule above, into the document template
+# generated by the following rule
+#
+readme.txt.in: README.in NEWS.in INSTALL.in
        rm -f $@
        for input in $^; do \
-         case $$input in *.in) \
-           sed -f gendoc.combined.sed $$input | $(NROFF) >> $@ ;; \
-           esac; \
+         sed -f gendoc.combined.sed $$input | $(NROFF) >> $@; \
          done
-       echo '$$Document: $@ $$: end of file' >> $@
-       rm -f gendoc.combined.sed
 
 # Workspace clean-up...
 #