branch release/7.1 updated: Fix out-of-source build of texi2any_internals.texi

[Gavin D. Smith]

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

gavin pushed a commit to branch release/7.1
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.1 by this push:
     new 50d0cd3f11 Fix out-of-source build of texi2any_internals.texi
50d0cd3f11 is described below

commit 50d0cd3f1143949401ee304b90bfb7b9a04157b7
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jun 17 19:25:07 2024 +0100

    Fix out-of-source build of texi2any_internals.texi
    
    Two changes:
    
    2024-06-17  Patrice Dumas  <pertusus@free.fr>
    
            * doc/tp_api/Makefile.am
            (MAKEINFO_ENVIRONMENT, MAKEINFO, texi2any_internals.texi): set/use
            environment variables to have ModulePath.pm work correctly.  Remove 
-I
            options now unneeded.
    
    2024-06-17  Gavin Smith <gavinsmith0123@gmail.com>
    
            Fix out-of-source build of texi2any_internals.texi
    
            Pass  "-I $(top_builddir)/tp" to perl to find generated modules.
            Filter output through sed by outputting a temporary file rather
            than piping output - this allows detecting if perl run failed.
---
 ChangeLog              | 15 +++++++++++++++
 doc/tp_api/Makefile.am | 15 +++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a50bad80c..cde99d9d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2024-06-17  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/tp_api/Makefile.am
+       (MAKEINFO_ENVIRONMENT, MAKEINFO, texi2any_internals.texi): set/use
+       environment variables to have ModulePath.pm work correctly.  Remove -I
+       options now unneeded.
+
+2024-06-17  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Fix out-of-source build of texi2any_internals.texi
+
+        Pass  "-I $(top_builddir)/tp" to perl to find generated modules.
+        Filter output through sed by outputting a temporary file rather
+        than piping output - this allows detecting if perl run failed.
+
 2024-06-17  Gavin Smith <gavinsmith0123@gmail.com>
 
        Info tests timeout
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index 44b0f36736..f76b7e98f8 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for texinfo/doc/tp_api.
 #
-# Copyright 2012-2022 Free Software Foundation, Inc.
+# Copyright 2012-2024 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -14,10 +14,11 @@
 # texi2any_internals_indices.texi soes not appear in any menu.
 AM_MAKEINFOFLAGS = -c INFO_SPECIAL_CHARS_WARNING=0 -c 
TREE_TRANSFORMATIONS=complete_tree_nodes_menus
 
-# Use the programs built in our distribution, taking account of possible
-# cross-compiling.  The first -I is there to find Texinfo::ModulePath in
-# out-of-source builds.
-MAKEINFO = $(PERL) -I $(top_builddir)/tp/ -I $(top_srcdir)/tp/ 
$(top_srcdir)/tp/texi2any.pl
+# Use the programs built in our distribution.
+MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 \
+                       top_srcdir="$(top_srcdir)" \
+                       top_builddir="$(top_builddir)"
+MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_srcdir)/tp/texi2any.pl
 
 TEXI2DVI_ENVIRONMENT = TEXINDEX=${abs_top_builddir}/texindex/texindex \
                        TEXINDEX_SCRIPT=${abs_top_srcdir}/texindex/texindex.awk
@@ -70,6 +71,8 @@ texi2any_internals_dependencies = \
   $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm
 
 texi2any_internals.texi: $(texi2any_internals_dependencies) 
texi2any_internals_indices.texi texi2any_internals_preamble.texi
-       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - 
--subdir=api_includes $(texi2any_internals_dependencies) < 
$(srcdir)/texi2any_internals_preamble.texi | sed -e 's/^@bye/@__bye/' | sed -e 
'/^@__bye/r $(srcdir)/texi2any_internal [...]
+       if $(MAKEINFO_ENVIRONMENT) $(PERL) -I 
$(top_srcdir)/Pod-Simple-Texinfo/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - 
--subdir=api_includes $(texi2any_internals_dependencies) < 
$(srcdir)/texi2any_internals_preamble.texi >$@.tmp ; then \
+         cat $@.tmp  | sed -e 's/^@bye/@__bye/' | sed -e '/^@__bye/r 
$(srcdir)/texi2any_internals_indices.texi' | sed -e 's/^@__bye//' > $@ ; \
+       fi ; rm -f $@.tmp
 
 endif