diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-03-27 00:34:06 +1100 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-03-28 22:25:54 +1100 |
| commit | e78bd20d54de27c2c20deddd1bba1f00e770f85b (patch) | |
| tree | 12287eca77f68df8d4e8d60757a221b7cca4514a /contrib/hdtbl | |
| parent | 6e049e57ba5b33b42357069dbf9486552e1d70d7 (diff) | |
| download | groff-git-e78bd20d54de27c2c20deddd1bba1f00e770f85b.tar.gz | |
[doc]: Refactor handling of "gnu.eps" file.
* doc/doc.am: Put "gnu.eps" in a Make macro, `DOC_GNU_EPS`.
($(PROCESSEDEXAMPLEFILES) $(PROCESSEDDOCFILES), doc/webpage.html,
install_doc_examples): Migrate dependency to `DOC_GNU_EPS`.
(doc/webpage.ps): Add (missing) dependency on `DOC_GNU_EPS`.
(DOC_GROFF_ONLY): Drop `-I` flag; it's not necessary given the
following.
(.ms.ps): Drop `-mwww` argument from suffix rule. A truly generic ms
document won't need it.
(doc/webpage.ps): Add target rule. Include `-mwww` argument.
(doc/webpage.ps, doc/webpage.html): Pass `-I` option to `DOC_GROFF`
and `DOC_GROFF_ONLY` (respectively) to enable location of "gnu.eps"
file. Search the build and source trees' "doc" directories because
the file can be generated as part of the build or can come with the
distribution archive.
(clean_maintdoc): Add phony target to dispose of `DOC_GNU_EPS`.
(maintainer-clean-local): Depend on "clean_maintdoc".
* contrib/hdtbl/hdtbl.am (nodist_hdtblexample_DATA,
HDTBLPROCESSEDEXAMPLEFILES):
* contrib/pdfmark/pdfmark.am (PDFDOCFILES): Replace hard-coded "gnu.eps"
file name with expansion of `DOC_GNU_EPS`.
* contrib/hdtbl/hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Pass `-I` option
to `HDTBLGROFF` to enable location of "gnu.eps" file (for
"mixedpickles.roff" document).
* contrib/mom/mom.am (MOMPROCESSEDEXAMPLEFILES): Drop dependency on
gnu.eps. No mom document appears to require this file; it came in
with the initial Automake file for mom in commit 4d84d0f1d, 27 January
2015, and may have been a copy-and-paste error.
* contrib/pdfmark/pdfmark.am (contrib/pdfmark/pdfmark.pdf): Pass `-I`
option to pdfroff(1) to enable location of "gnu.eps" file.
* tmac/tests/pdfpic_does-not-choke-on-bad-pdfinfo-output.sh:
* tmac/tests/pdfpic_falls-back-to-PSPIC.sh: Update tests to look for
"gnu.eps" in "doc" directory of build tree.
Diffstat (limited to 'contrib/hdtbl')
| -rw-r--r-- | contrib/hdtbl/ChangeLog | 9 | ||||
| -rw-r--r-- | contrib/hdtbl/hdtbl.am | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog index b6c16051d..7f95a28f1 100644 --- a/contrib/hdtbl/ChangeLog +++ b/contrib/hdtbl/ChangeLog @@ -1,3 +1,12 @@ +2022-03-26 G. Branden Robinson <g.branden.robinson@gmail.com> + + * hdtbl.am (nodist_hdtblexample_DATA, + HDTBLPROCESSEDEXAMPLEFILES): Replace hard-coded "gnu.eps" file + name with expansion of `DOC_GNU_EPS`. + (HDTBLPROCESSEDEXAMPLEFILES): Pass `-I` option to `HDTBLGROFF` + to enable location of "gnu.eps" file (for "mixedpickles.roff" + document). + 2021-10-21 G. Branden Robinson <g.branden.robinson@gmail.com> * hdtbl.am: diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am index 1e219a82a..8652d49d5 100644 --- a/contrib/hdtbl/hdtbl.am +++ b/contrib/hdtbl/hdtbl.am @@ -83,7 +83,7 @@ dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES) nodist_hdtblexample_DATA = \ $(HDTBLGENFILES) \ $(HDTBLPROCESSEDEXAMPLEFILES) \ - gnu.eps + $(DOC_GNU_EPS) else EXTRA_DIST += $(HDTBLEXAMPLEFILES) endif @@ -116,7 +116,7 @@ SUFFIXES += .roff .in .ps .roff.ps: $(GROFF_V)$(MKDIR_P) `dirname $@` \ - && $(HDTBLGROFF) -Tps \ + && $(HDTBLGROFF) -I $(doc_builddir) -I $(doc_srcdir) -Tps \ -dfontpath=$(top_srcdir)/font \ -dsopath=$(hdtbl_srcdir)/ \ -mhdtbl $< >$@ @@ -127,7 +127,7 @@ SUFFIXES += .roff .in .ps -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ -$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff eqn pic tbl \ +$(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \ contrib/hdtbl/examples/common.roff uninstall_groffdirs: uninstall-hdtbl-hook |