gbranden pushed a commit to branch branden-2023-07-05 in repository groff. commit 7055449bf2af92bb56f32d24333a26a3f49074fc Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Wed Apr 5 09:22:58 2023 -0500
[doc]: Fix Savannah #62541 (2/4). [doc]: Add document deps on the ms package. * tmac/tmac.am (TMAC_PACKAGE_MS): Define new macro comprising the files of the ms package. * doc/doc.am (doc/ms.ps, doc/webpage.ps, doc/pic.html, doc/pic.ps): Add dependency on new macro. Fixes <https://savannah.gnu.org/bugs/?62541> (2/4). --- ChangeLog | 11 +++++++++++ contrib/pdfmark/pdfmark.am | 3 ++- contrib/sboxes/sboxes.am | 3 ++- doc/doc.am | 8 ++++---- tmac/tmac.am | 1 + 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54344e91e..9c4910dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2023-04-03 G. Branden Robinson <g.branden.robin...@gmail.com> + + [doc]: Add document dependencies on the ms package. + + * tmac/tmac.am (TMAC_PACKAGE_MS): Define new macro comprising + the files of the ms package. + * doc/doc.am (doc/ms.ps, doc/webpage.ps, doc/pic.html) + (doc/pic.ps): Add dependency on new macro. + + Fixes <https://savannah.gnu.org/bugs/?62541> (2/4). + 2023-04-03 G. Branden Robinson <g.branden.robin...@gmail.com> [doc]: Add document dependencies on the "me" package. diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am index 15eec8c67..64ab0ed6a 100644 --- a/contrib/pdfmark/pdfmark.am +++ b/contrib/pdfmark/pdfmark.am @@ -61,7 +61,8 @@ PDFROFF=\ ./pdfroff \ $(FFLAG) $(MFLAG) -dpaper=$(PAGE) -P-p$(PAGE) -M$(pdfmark_srcdir) -contrib/pdfmark/pdfmark.pdf: contrib/pdfmark/pdfmark.ms +contrib/pdfmark/pdfmark.pdf: contrib/pdfmark/pdfmark.ms \ + $(TMAC_PACKAGE_MS) $(GROFF_V)$(MKDIR_P) `dirname $@` \ && $(PDFROFF) -I $(doc_builddir) -I $(doc_srcdir) -mspdf \ --stylesheet=$(pdfmark_srcdir)/cover.ms \ diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am index 7786337d9..4d29724be 100644 --- a/contrib/sboxes/sboxes.am +++ b/contrib/sboxes/sboxes.am @@ -54,7 +54,8 @@ $(sboxes_builddir)/msboxes.ms: $(SBOXES_EXAMPLEFILES) $(sboxesnotquine) $(AM_V_GEN)mv $@.tmp $@ $(sboxes_builddir)/msboxes.pdf: $(sboxes_builddir)/msboxes.ms \ - $(dist_sboxestmac_DATA) groff troff gropdf font/devpdf/stamp + $(TMAC_PACKAGE_MS) $(dist_sboxestmac_DATA) groff troff gropdf \ + font/devpdf/stamp $(GROFF_V)$(DOC_GROFF) -M$(sboxes_srcdir) -ms -msboxes -Tpdf \ $(sboxes_builddir)/msboxes.ms > $@ diff --git a/doc/doc.am b/doc/doc.am index 8ef9aabf7..3541bce34 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -345,16 +345,16 @@ doc/meintro_fr.ps: doc/meintro_fr.me preconv $(GROFF_V)$(MKDIR_P) `dirname $@` \ && $(DOC_GROFF) -K utf8 -t -Tps -me -mfr $< >$@ -doc/ms.ps: $(doc_srcdir)/ms.ms eqn tbl +doc/ms.ps: $(doc_srcdir)/ms.ms $(TMAC_PACKAGE_MS) eqn tbl $(GROFF_V)$(MKDIR_P) `dirname $@` \ && $(DOC_GROFF) -et -Tps -ms $(doc_srcdir)/ms.ms >$@ -doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl +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 >$@ doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl -doc/webpage.ps: $(doc_srcdir)/webpage.ms +doc/webpage.ps: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS) $(GROFF_V)$(MKDIR_P) `dirname $@` \ && $(DOC_GROFF) -I $(doc_srcdir) -I $(doc_builddir) -t -Tps \ -ms -mwww $(doc_srcdir)/webpage.ms >$@ @@ -366,7 +366,7 @@ doc/webpage.ps: $(doc_srcdir)/webpage.ms doc/pic.html: eqn pic tbl doc/pic.html: tmac/www.tmac -doc/pic.html: $(doc_srcdir)/pic.ms +doc/pic.html: $(doc_srcdir)/pic.ms $(TMAC_PACKAGE_MS) $(GROFF_V)$(MKDIR_P) $(doc_builddir) \ && cd $(doc_builddir) \ && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \ diff --git a/tmac/tmac.am b/tmac/tmac.am index 0d0f27b23..1e83253b1 100644 --- a/tmac/tmac.am +++ b/tmac/tmac.am @@ -378,6 +378,7 @@ TMAC_PACKAGE_MAN = tmac/an.tmac tmac/an-ext.tmac TMAC_PACKAGE_MDOC = tmac/doc.tmac tmac/mdoc/doc-common \ tmac/mdoc/doc-ditroff tmac/mdoc/doc-nroff tmac/mdoc/doc-syms TMAC_PACKAGE_ME = tmac/e.tmac +TMAC_PACKAGE_MS = tmac/s.tmac # Local Variables: _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit