[groff] 15/27: [build]: Handle "gnu.eps" file better.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 258da3942518d3851a3291eee63923f005ef0d73
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue May 3 10:31:53 2022 -0500

    [build]: Handle "gnu.eps" file better.
    
    * doc/doc.am (GENERATEDDOCFILES): Remove `$(DOC_GNU_EPS)`.
    
      (EXTRA_DIST): Ship `$(DOC_GNU_EPS)` in distribution archive.
    
      ($(DOC_GNU_EPS)): Simplify rule commands; stop trying to copy the file
      around since it will either be (1) in the distribution archive from
      which a build is performed; or (2) missing because a build is being
      done from Git, in which case we expect the PNM tools to be available.
---
 ChangeLog  | 12 ++++++++++++
 doc/doc.am | 43 ++++++++++++++++++-------------------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e7dea506..22622813 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-05-02  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [build]: Handle "gnu.eps" file better.
+
+       * doc/doc.am (GENERATEDDOCFILES): Remove `$(DOC_GNU_EPS)`.
+       (EXTRA_DIST): Ship `$(DOC_GNU_EPS)` in distribution archive.
+       ($(DOC_GNU_EPS)): Simplify rule commands; stop trying to copy
+       the file around since it will either be (1) in the distribution
+       archive from which a build is performed; or (2) missing because
+       a build is being done from Git, in which case we expect the PNM
+       tools to be available.
+
 2022-05-02  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/doc.am (clean_otherdoc): Drop target: it doesn't seem to
diff --git a/doc/doc.am b/doc/doc.am
index 99265155..88b9b9df 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -53,7 +53,6 @@ DOCFILES_NOINST = \
   doc/meref.me.in
 # Files that undergo a transformation prior to groff processing
 GENERATEDDOCFILES = \
-  $(DOC_GNU_EPS) \
   doc/meintro.me \
   doc/meintro_fr.me \
   doc/meref.me
@@ -629,31 +628,25 @@ uninstall-html:
        $(RM) $(DESTDIR)$(htmldocdir)/groff.html.*
 
 # An image of a gnu in enscapsulated PostScript is generated during the
-# build process if possible.
-EXTRA_DIST += doc/gnu.xpm
+# build process if necessary.  We assume pnmdepth is available if
+# xpmtoppm is.
+EXTRA_DIST += $(DOC_GNU_EPS) doc/gnu.xpm
 $(DOC_GNU_EPS): doc/gnu.xpm
-       $(AM_V_GEN)if test -f $(top_srcdir)/doc/gnu.eps; then \
-         cp $(top_srcdir)/doc/gnu.eps . ; \
-       elif test -f $(top_builddir)/doc/gnu.eps; then \
-         cp $(top_builddir)/doc/gnu.eps . ; \
-       else \
-         if test ""$(XPMTOPPM) != "found"; then \
-           echo "program xpmtoppm is missing; can't generate $@" >&2;\
-           exit 1; \
-         fi; \
-         if test ""$(pnmtops) != "found"; then \
-           echo "program pnmtops is missing; can't generate $@" >&2;\
-           exit 1; \
-         fi; \
-         if ! echo "$(pnmtops_nosetpage)" | grep -q nosetpage; then \
-           echo "program pnmtops can't handle -nosetpage option;" \
-             "can't generate $@" >&2;\
-           exit 1; \
-         fi; \
-         xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
-           | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
-       fi
-       $(AM_V_GEN)test -f $(top_builddir)/doc/gnu.eps
+       $(AM_V_GEN)if test "$(XPMTOPPM)" != found; then \
+         echo "program xpmtoppm is missing; can't generate $@" >&2;\
+         exit 1; \
+       fi; \
+       if test "$(pnmtops)" != found; then \
+         echo "program pnmtops is missing; can't generate $@" >&2;\
+         exit 1; \
+       fi; \
+       if ! echo "$(pnmtops_nosetpage)" | grep -q nosetpage; then \
+         echo "program pnmtops can't handle -nosetpage option;" \
+           "can't generate $@" >&2;\
+         exit 1; \
+       fi; \
+       xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
+         | $(pnmtops_nosetpage) -noturn -rle >$@
 
 # Provide a copy of the image in the distribution archive to accommodate
 # systems without a tool to generate it from an X pixmap.