groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 03/05: doc/doc.am: Stop treating "gnu.eps" as "example".


From: G. Branden Robinson
Subject: [groff] 03/05: doc/doc.am: Stop treating "gnu.eps" as "example".
Date: Sun, 3 Apr 2022 12:24:10 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 63a89eb5888fb9ec5596eda8fa6c259501df7cf9
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Apr 3 22:03:38 2022 +1000

    doc/doc.am: Stop treating "gnu.eps" as "example".
    
    * doc/doc.am: Stop treating "gnu.eps" as an "example" file; it is also
      used by pdfmark's cover.ms, which is ordinary documentation.  We
      therefore must not omit it when building.
    
      (install-data-hook): Add dependency on new phony target,
      "install_doc_gnu_eps".
    
      (install_doc_examples): Move installation of "gnu.eps" from here...
      (install_doc_gnu_eps): ...to here.  Also refactor the loop we use to
      locate the file follow a more idiomatic pattern.
---
 ChangeLog  | 12 ++++++++++++
 doc/doc.am | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84d6deda..408fcbc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-04-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am: Stop treating "gnu.eps" as an "example" file; it
+       is also used by pdfmark's cover.ms, which is ordinary
+       documentation.  We therefore must not omit it when building.
+       (install-data-hook): Add dependency on new phony target,
+       "install_doc_gnu_eps".
+       (install_doc_examples): Move installation of "gnu.eps" from
+       here...
+       (install_doc_gnu_eps): ...to here.  Also refactor the loop we
+       use to locate the file follow a more idiomatic pattern.
+
 2022-04-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/doc.am (dist-info-bits, install_infodoc, dist-gnueps): Fix
diff --git a/doc/doc.am b/doc/doc.am
index 39e4c630..1328d1d9 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -382,14 +382,19 @@ if BUILD_HTML
          $(DESTDIR)$(htmldocimagedir)
 endif
 
-install-data-hook: install_doc_examples
+install-data-hook: install_doc_gnu_eps install_doc_examples
+
+install_doc_gnu_eps: $(DOC_GNU_EPS)
+       for d in $(doc_builddir) $(doc_srcdir); do \
+         if test -f "$$d/gnu.eps"; then \
+           $(RM) $(DESTDIR)$(exampledir)/gnu.eps; \
+           $(INSTALL_DATA) \
+             $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps; \
+           break; \
+         fi; \
+       done
+
 install_doc_examples: $(DOC_GNU_EPS)
-if BUILD_EXAMPLES
-# Prefer gnu.eps in builddir over srcdir.
-       d=.; test -f "gnu.eps" || d=$(doc_srcdir); \
-         $(RM) $(DESTDIR)$(exampledir)/gnu.eps; \
-         $(INSTALL_DATA) $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps
-endif
 if BUILD_HTMLEXAMPLES
        cd $(doc_builddir) && \
        for f in `ls $(HTMLEXAMPLEFILESALL)`; do \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]