branch master updated: Fix "make distcheck" without installed texinfo.tex

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 32f8940b73 Fix "make distcheck" without installed texinfo.tex
32f8940b73 is described below

commit 32f8940b730f9893f56388be57e30f1b41f3fd3d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Aug 14 13:36:46 2023 +0100

    Fix "make distcheck" without installed texinfo.tex
    
    * doc/Makefile.am (TEXI2DVI_ENVIRONMENT),
    * doc/tp_api/Makefile.am (TEXI2DVI_ENVIRONMENT):
    Do not export TEXINDEX or TEXINDEX_SCRIPT shell variables in
    separate shell statements.
    
    As texi2dvi was run by Makefile rules like
    
      TEXINPUTS=... MAKEINFO=... \
      TEXINDEX=... ; export TEXINDEX ; \
      TEXINDEX_SCRIPT=... ; export TEXINDEX_SCRIPT ; ../util/texi2dvi ...
    
    the first semicolon ended the shell statement where TEXINPUTS and
    MAKEINFO were set, so they were not set correctly for texi2dvi.
    This broke "make distcheck" under doc/tp_api, where texinfo.tex
    was not found, if not installed on the user's system.
---
 ChangeLog              | 20 ++++++++++++++++++++
 doc/Makefile.am        |  4 ++--
 doc/tp_api/Makefile.am |  4 ++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d5f7811e5..5c29a7fa6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2023-08-14  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Fix "make distcheck" without installed texinfo.tex
+
+       * doc/Makefile.am (TEXI2DVI_ENVIRONMENT),
+       * doc/tp_api/Makefile.am (TEXI2DVI_ENVIRONMENT):
+       Do not export TEXINDEX or TEXINDEX_SCRIPT shell variables in
+       separate shell statements.
+
+       As texi2dvi was run by Makefile rules like
+
+         TEXINPUTS=... MAKEINFO=... \
+         TEXINDEX=... ; export TEXINDEX ; \
+         TEXINDEX_SCRIPT=... ; export TEXINDEX_SCRIPT ; ../util/texi2dvi ...
+
+       the first semicolon ended the shell statement where TEXINPUTS and
+       MAKEINFO were set, so they were not set correctly for texi2dvi.
+       This broke "make distcheck" under doc/tp_api, where texinfo.tex
+       was not found, if not installed on the user's system.
+
 2023-08-13  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/XS: Run "gnulib-tool --add-import"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2a2d817157..dbbea4edcb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,8 +28,8 @@ MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) 
$(top_builddir)/tp/texi2any
 
 # NOTE the four ../ are needed because texi2dvi runs texindex from the build 
dir
 # texi2any_internals.t2d/texi2any_internals.t2d/dvi/build/
-TEXI2DVI_ENVIRONMENT = TEXINDEX=${top_builddir}/../../../../texindex/texindex 
; export TEXINDEX ; \
-                       
TEXINDEX_SCRIPT=${top_srcdir}/../../../../texindex/texindex.awk ; export 
TEXINDEX_SCRIPT ;
+TEXI2DVI_ENVIRONMENT = TEXINDEX=${top_builddir}/../../../../texindex/texindex \
+                       
TEXINDEX_SCRIPT=${top_srcdir}/../../../../texindex/texindex.awk
 TEXI2DVI = $(TEXI2DVI_ENVIRONMENT) $(top_srcdir)/util/texi2dvi
 
 # include pod2texi in the main manual
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index d9bf270113..71ea2ededc 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -21,8 +21,8 @@ MAKEINFO = $(PERL) -I $(top_builddir)/tp/ -I 
$(top_srcdir)/tp/ $(top_srcdir)/tp/
 
 # NOTE the four ../ are needed because texi2dvi runs texindex from the build 
dir
 # texi2any_internals.t2d/texi2any_internals.t2d/dvi/build/
-TEXI2DVI_ENVIRONMENT = TEXINDEX=$(top_builddir)/../../../../texindex/texindex 
; export TEXINDEX ; \
-                       
TEXINDEX_SCRIPT=$(top_srcdir)/../../../../texindex/texindex.awk ; export 
TEXINDEX_SCRIPT ;
+TEXI2DVI_ENVIRONMENT = TEXINDEX=${top_builddir}/../../../../texindex/texindex \
+                       
TEXINDEX_SCRIPT=${top_srcdir}/../../../../texindex/texindex.awk
 TEXI2DVI = $(TEXI2DVI_ENVIRONMENT) $(top_srcdir)/util/texi2dvi
 
 # the pod files are formatted like man pages.  If HTML is split at node