branch release/7.1 updated: Fix out-of-source build of pod2texi.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 30d3735c2e Fix out-of-source build of pod2texi.texi
30d3735c2e is described below

commit 30d3735c2ed6cd0591eb68c7ce8fb4b66364aa81
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jun 17 19:40:14 2024 +0100

    Fix out-of-source build of pod2texi.texi
    
    * doc/Makefile.am (pod2texi.texi): use
    MAKEINFO_ENVIRONMENT environment variable to have ModulePath.pm
    work correctly.  Remove -I options now unneeded.  Create
    pod2texi.texi in $(srcdir) by passing the --subdir option.
---
 ChangeLog       |  9 +++++++++
 doc/Makefile.am | 13 +++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cde99d9d01..326d0095a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-06-17  Patrice Dumas  <pertusus@free.fr>
+
+       Fix out-of-source build of pod2texi.texi
+
+       * doc/Makefile.am (pod2texi.texi): use
+       MAKEINFO_ENVIRONMENT environment variable to have ModulePath.pm
+       work correctly.  Remove -I options now unneeded.  Create
+       pod2texi.texi in $(srcdir) by passing the --subdir option.
+
 2024-06-17  Patrice Dumas  <pertusus@free.fr>
 
        * doc/tp_api/Makefile.am
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e9e6298652..381dffc93f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -35,12 +35,13 @@ pod2texi_pl = 
$(abs_top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
 
 if BUILD_PERL_API_TEXI
 # we setup the conversion to Texinfo for inclusion in a document,
-# but we ignore the resulting document, as we include from the
-# Texinfo manual.  The file name for the included section
-# is therefore determined by the information in the Pod file NAME
-# section.
-pod2texi.texi: $(pod2texi_pl)
-       $(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=subsubsection 
--no-section-nodes --headings-as-sections $(pod2texi_pl) > /dev/null
+# but we ignore the main document (output to /dev/null) that includes
+# each portion of Texinfo converted from the pod files (here only from
+# pod2texi.pl), as we include from the Texinfo manual.  The file name
+# for the included section is therefore determined by the information
+# in the Pod file NAME section.
+$(srcdir)/pod2texi.texi: $(pod2texi_pl)
+       $(MAKEINFO_ENVIRONMENT) $(PERL) -I 
$(top_srcdir)/Pod-Simple-Texinfo/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=subsubsection 
--no-section-nodes --headings-as-sections --subdir=$(srcdir) $(pod2texi_pl) > 
/dev/null
 endif
 
 # We'd also like to use something like this, but Automake calls