branch master updated: Do not rely on texi2dvi internal directory layout

[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 e6cd680699 Do not rely on texi2dvi internal directory layout
e6cd680699 is described below

commit e6cd6806996f0d7b053c3762901ba8814b22fa27
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Aug 14 14:17:33 2023 +0100

    Do not rely on texi2dvi internal directory layout
    
    * doc/Makefile.am (TEXI2DVI_ENVIRONMENT),
    * doc/tp_api/Makefile.am (TEXI2DVI_ENVIRONMENT):
    Use $(abs_top_srcdir) and $(abs_top_builddir) to reference texindex
    files, rather than $(top_srcdir) and $(top_builddir) concatenated
    with a certain number of "../", as this is hard to understand and
    depends on internal details of texi2dvi that we shouldn't have
    to think about.
---
 ChangeLog              | 12 ++++++++++++
 doc/Makefile.am        |  6 ++----
 doc/tp_api/Makefile.am |  6 ++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c29a7fa6d..be92388f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-08-14  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Do not rely on texi2dvi internal directory layout
+
+       * doc/Makefile.am (TEXI2DVI_ENVIRONMENT),
+       * doc/tp_api/Makefile.am (TEXI2DVI_ENVIRONMENT):
+       Use $(abs_top_srcdir) and $(abs_top_builddir) to reference texindex
+       files, rather than $(top_srcdir) and $(top_builddir) concatenated
+       with a certain number of "../", as this is hard to understand and
+       depends on internal details of texi2dvi that we shouldn't have
+       to think about.
+
 2023-08-14  Gavin Smith <gavinsmith0123@gmail.com>
 
        Fix "make distcheck" without installed texinfo.tex
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dbbea4edcb..e71451eb84 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,10 +26,8 @@ MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 ; export 
TEXINFO_DEV_SOURCE ; \
                        top_builddir="$(top_builddir)" ; export top_builddir ;
 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 \
-                       
TEXINDEX_SCRIPT=${top_srcdir}/../../../../texindex/texindex.awk
+TEXI2DVI_ENVIRONMENT = TEXINDEX=${abs_top_builddir}/texindex/texindex \
+                       TEXINDEX_SCRIPT=${abs_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 71ea2ededc..44b0f36736 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -19,10 +19,8 @@ AM_MAKEINFOFLAGS = -c INFO_SPECIAL_CHARS_WARNING=0 -c 
TREE_TRANSFORMATIONS=compl
 # out-of-source builds.
 MAKEINFO = $(PERL) -I $(top_builddir)/tp/ -I $(top_srcdir)/tp/ 
$(top_srcdir)/tp/texi2any.pl
 
-# 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 \
-                       
TEXINDEX_SCRIPT=${top_srcdir}/../../../../texindex/texindex.awk
+TEXI2DVI_ENVIRONMENT = TEXINDEX=${abs_top_builddir}/texindex/texindex \
+                       TEXINDEX_SCRIPT=${abs_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