[groff] 15/21: [build]: Fix Savannah #64681 (webpage.ps deps).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 22e0153d6c204dc2dfe34bc2b6e3be7d878ca8b1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Sep 16 16:28:00 2023 -0500

    [build]: Fix Savannah #64681 (webpage.ps deps).
    
    * doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize
      target dependencies.  Resolve race by requiring "grn" and "soelim" to
      be built first.  Also add dependency on `$(TMAC_PACKAGE_MS)`.
    
    Fixes <https://savannah.gnu.org/bugs/?64681>.  Thanks to Alexander
    Kanavin for the report.
    
    ANNOUNCE: Acknowledge Alexander.
---
 ANNOUNCE   |  1 +
 ChangeLog  | 10 ++++++++++
 doc/doc.am | 12 ++++++++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index dbde44677..76f1d3abb 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -169,6 +169,7 @@ of this release.
    similar from the contrib/ change log files may also be necessary. ]]
 
 Alex Colomar
+Alexander Kanavin
 Bjarni Ingi Gislason
 Brian Inglis
 Bruno Haible
diff --git a/ChangeLog b/ChangeLog
index 0382d3f20..eea3c5255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-09-16  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and
+       parallelize target dependencies.  Resolve race by requiring
+       "grn" and "soelim" to be built first.  Also add dependency on
+       `$(TMAC_PACKAGE_MS)`.
+
+       Fixes <https://savannah.gnu.org/bugs/?64681>.  Thanks to
+       Alexander Kanavin for the report.
+
 2023-09-15  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/roff/troff/input.cpp (charinfo_to_node_list): Trivially
diff --git a/doc/doc.am b/doc/doc.am
index 50d58057a..c67b2ca16 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -356,6 +356,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms $(TMAC_PACKAGE_MS) eqn pic 
tbl
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
        && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@
 
+# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
+# soelim even though the document doesn't require them.
+doc/webpage.ps: grn soelim
 doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl
 doc/webpage.ps: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS)
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
@@ -375,11 +378,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms $(TMAC_PACKAGE_MS)
        && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
          $(doc_srcdir)/pic.ms > pic.html
 
-doc/webpage.html: tbl
-doc/webpage.html: tmac/www.tmac
-doc/webpage.html: $(DOC_GNU_EPS)
+# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
+# soelim even though the document doesn't require them.
+doc/webpage.html: grn soelim
+doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl
 doc/webpage.html: $(doc_srcdir)/groff.css
-doc/webpage.html: $(doc_srcdir)/webpage.ms
+doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS)
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
        && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \