groff-commit
[Top][All Lists]
Advanced

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

[groff] 27/27: [build]: Fix logic error.


From: G. Branden Robinson
Subject: [groff] 27/27: [build]: Fix logic error.
Date: Tue, 3 May 2022 14:27:19 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 0328fd9d7327f8b5018c60d207c81dff6d261194
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue May 3 13:20:28 2022 -0500

    [build]: Fix logic error.
    
    * doc/doc.am (dist-info-bits, install_infodoc, dist-gnueps): Fix logic
      error.  When checking both source and build trees for files to copy,
      break after successfully copying the files, not after the first
      iteration of the loop unconditionally.  This caused the Info documents
      not to be installed from out-of-tree builds, and potentially would
      prevent them and doc/gnu.eps from being included in the distribution
      archive if for some reason they didn't build and that build failure
      were not treated as an error.  Problems introduced by me in commits
      e78bd20d54, 27 March, and d79c3f3a4a, 11 November.
---
 ChangeLog  | 13 +++++++++++++
 doc/doc.am |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b553daca..67102794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-05-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am (dist-info-bits, install_infodoc, dist-gnueps): Fix
+       logic error.  When checking both source and build trees for
+       files to copy, break after successfully copying the files, not
+       after the first iteration of the loop unconditionally.  This
+       caused the Info documents not to be installed from out-of-tree
+       builds, and potentially would prevent them and doc/gnu.eps from
+       being included in the distribution archive if for some reason
+       they didn't build and that build failure were not treated as an
+       error.  Problems introduced by me in commits e78bd20d54, 27
+       March, and d79c3f3a4a, 11 November.
+
 2022-05-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * m4/groff.m4 (GROFF_APPRESDIR_OPTION): Update comments and
diff --git a/doc/doc.am b/doc/doc.am
index 0171d8d2..fe965525 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -514,8 +514,8 @@ dist-info-bits:
        for d in $(doc_builddir) $(doc_srcdir); do \
          if [ -f "$$d"/groff.info ]; then \
            cp -f "$$d"/groff.info-* $(distdir)/doc; \
+           break; \
          fi; \
-         break; \
        done
 
 EXTRA_DIST += doc/groff.txt
@@ -599,8 +599,8 @@ install_infodoc: doc/groff.info
            cp "$$d"/groff.info* $(DESTDIR)$(infodir); \
            $(INSTALL_INFO) --info-file="$$d"/groff.info \
              --info-dir=$(DESTDIR)$(infodir); \
+           break; \
          fi; \
-         break; \
        done
 install-pdf-local: doc/groff.pdf
        -test -d $(DESTDIR)$(pdfdocdir) \
@@ -657,8 +657,8 @@ dist-gnueps:
        for d in $(doc_builddir) $(doc_srcdir); do \
          if [ -f "$$d"/$(DOC_GNU_EPS) ]; then \
            cp -f "$$d"/$(DOC_GNU_EPS) $(distdir)/doc; \
+           break; \
          fi; \
-         break; \
        done
 
 



reply via email to

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