gbranden pushed a commit to branch branden-2023-07-05 in repository groff. commit 5200f574bade1e2110dd8595cf2250fd0aa4d5d8 Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Mon Apr 3 23:23:24 2023 -0500
[build]: Install PDF documents better. Ship only one copy of "automake.pdf", and install it and the new "groff-man-pages.pdf" in the "pdf/" subdirectory of the destination "doc" directory. * doc/doc.am (PROCESSEDDOCFILES): Drop "$(PROCESSEDDOCFILES_PDF)" from macro definition. (nodist_docpdfdoc_DATA) [USE_GROPDF]: Use it here instead, replacing a literal "doc/automake.pdf". (mostlyclean-doc) [USE_GROPDF]: Clean these same files. --- ChangeLog | 12 ++++++++++++ doc/doc.am | 11 +++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c33681b23..90a21f0ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2023-04-03 G. Branden Robinson <g.branden.robin...@gmail.com> + + [build]: Install PDF documents better. Ship only one copy of + "automake.pdf", and install it and the new "groff-man-pages.pdf" + in the "pdf/" subdirectory of the destination "doc" directory. + + * doc/doc.am (PROCESSEDDOCFILES): Drop + "$(PROCESSEDDOCFILES_PDF)" from macro definition. + (nodist_docpdfdoc_DATA) [USE_GROPDF]: Use it here instead, + replacing a literal "doc/automake.pdf". + (mostlyclean-doc) [USE_GROPDF]: Clean these same files. + 2023-04-03 G. Branden Robinson <g.branden.robin...@gmail.com> [build]: Ship groff.dvi (our Texinfo manual in DVI format). diff --git a/doc/doc.am b/doc/doc.am index 0b8520450..3b83a5b49 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -79,9 +79,11 @@ PROCESSEDDOCFILES_TXT = \ # image files. If we include it here, a copy of its table of contents, # full of broken links to each section, gets placed directly in # $(DESTDIR)/$(docdir). +# +# $(PROCESSEDDOCFILES_PDF) is omitted because it's unnecessary; the +# Automake macro nodist_docpdfdoc_DATA does what we need. PROCESSEDDOCFILES = \ $(PROCESSEDDOCFILES_PS) \ - $(PROCESSEDDOCFILES_PDF) \ $(PROCESSEDDOCFILES_TXT) # Declare minimal dependencies for documents by output driver. @@ -106,12 +108,10 @@ nodist_otherdoc_DATA = $(PROCESSEDDOCFILES) $(GENERATEDDOCFILES) MOSTLYCLEANFILES += $(GENERATEDDOCFILES) $(PROCESSEDDOCFILES) EXTRA_DIST += $(DOCFILES_NOINST) -# pdf doc, written in mom and therefore using contrib/mom/mom.am -# definitions EXTRA_DIST += doc/automake.mom if USE_GROPDF docpdfdocdir = $(pdfdocdir) -nodist_docpdfdoc_DATA = doc/automake.pdf +nodist_docpdfdoc_DATA = $(PROCESSEDDOCFILES_PDF) endif doc/automake.pdf: doc/automake.mom pdfmom contrib/mom/om.tmac @@ -416,6 +416,9 @@ if USE_GROHTML rmdir $(doc_builddir)/img || :; \ fi endif +if USE_GROPDF + $(RM) $(PROCESSEDDOCFILES_PDF) +endif install-data-hook: install_doc_htmldoc install_doc_htmldoc: _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit