[groff] 01/01: Stop installing some *.in files.

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit 37cacdc36cc9cdcc1025144236f9734621aa99ae
Author: Ingo Schwarze <schwarze@openbsd.org>
AuthorDate: Sat Apr 2 12:56:55 2022 +0200

    Stop installing some *.in files.
    
    To this end, do not add them to *_DATA variables
    but only, and unconditionally, add them to EXTRA_DIST.
    While here, delete a comment from contrib/sboxes/sboxes.am
    that is in part obvious and in part wrong.
    
    OK gbranden@
---
 ChangeLog                |  5 +++++
 contrib/sboxes/ChangeLog |  5 +++++
 contrib/sboxes/sboxes.am |  7 +------
 doc/doc.am               | 14 ++++++++------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4380d618..a09226f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-04-02  Ingo Schwarze <schwarze@openbsd.org>
+
+       * doc/doc.am: Stop installing doc/meintro.me.in,
+       doc/meintro_fr.me.in, and doc/meref.me.in.
+
 2022-03-30  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/webpage.ms: Die horribly if `PSPIC` call fails.
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog
index 6413a4cc..3aafda5e 100644
--- a/contrib/sboxes/ChangeLog
+++ b/contrib/sboxes/ChangeLog
@@ -1,3 +1,8 @@
+2022-04-02  Ingo Schwarze <schwarze@openbsd.org>
+
+       * sboxes.am: Stop installing msboxes.ms.in;
+       installing msboxes.ms and msboxes.pdf is enough.
+
 2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * msboxes.ms.in: Tweak sboxes documentation to imply ms
diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am
index 8eaf3a69..f3fb63db 100644
--- a/contrib/sboxes/sboxes.am
+++ b/contrib/sboxes/sboxes.am
@@ -29,21 +29,16 @@ EXTRA_DIST += \
     contrib/sboxes/ChangeLog \
     contrib/sboxes/notquine.sed
 
-# Files installed in $(examplesdir)/sboxes.  SBOXES_EXAMPLEFILES are
-# located in the source tree, while SBOXESPROCESSEDEXAMPLEFILES are
-# generated in the build tree.
 SBOXES_EXAMPLEFILES = $(sboxes_srcdir)/msboxes.ms.in
 if BUILD_EXAMPLES
 sboxesexampledir = $(exampledir)/sboxes
-dist_sboxesexample_DATA = $(SBOXES_EXAMPLEFILES)
 SBOXES_PROCESSEDEXAMPLEFILES = $(sboxes_builddir)/msboxes.ms \
     $(sboxes_builddir)/msboxes.pdf
 sboxesprocessedexampledir = $(exampledir)/sboxes
 nodist_sboxesprocessedexample_DATA = $(SBOXES_PROCESSEDEXAMPLEFILES)
-else
+endif
 EXTRA_DIST += \
     contrib/sboxes/msboxes.ms.in
-endif
 
 MOSTLYCLEANFILES += msboxes.ms \
     $(SBOXES_PROCESSEDEXAMPLEFILES)
diff --git a/doc/doc.am b/doc/doc.am
index c7b49fdb..3df5ac56 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -51,13 +51,14 @@ DOC_GROFF = nlinit=`echo 'nl="'; echo '"'`; eval 
"$$nlinit"; \
 # Other doc, installed in $(docdir)
 if BUILD_OTHERDOC
 # Files located in the source tree
-DOCFILES= \
+DOCFILES_INST= \
   doc/me-revisions \
-  doc/meintro.me.in \
-  doc/meintro_fr.me.in \
-  doc/meref.me.in \
   doc/ms.ms \
   doc/pic.ms
+DOCFILES_NOINST= \
+  doc/meintro.me.in \
+  doc/meintro_fr.me.in \
+  doc/meref.me.in
 # Files that undergo a transformation prior to groff processing
 GENERATEDDOCFILES = \
   $(DOC_GNU_EPS) \
@@ -76,12 +77,13 @@ PROCESSEDDOCFILES = $(PROCESSEDDOCFILES_PS) \
   doc/groff-man-pages.utf8.txt
 
 otherdocdir = $(docdir)
-dist_otherdoc_DATA = $(DOCFILES) $(GENERATEDDOCFILES)
+dist_otherdoc_DATA = $(DOCFILES_INST) $(GENERATEDDOCFILES)
 nodist_otherdoc_DATA = $(PROCESSEDDOCFILES)
 MOSTLYCLEANFILES += $(PROCESSEDDOCFILES)
 else
-EXTRA_DIST += $(DOCFILES) $(GENERATEDDOCFILES)
+EXTRA_DIST += $(DOCFILES_INST) $(GENERATEDDOCFILES)
 endif
+EXTRA_DIST += $(DOCFILES_NOINST)
 
 # pdf doc, written in mom and therefore using contrib/mom/mom.am
 # definitions