branch master updated: * doc/Makefile.am (pod2texi.texi), 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.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 0f871a4f7c * doc/Makefile.am (pod2texi.texi), 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.
0f871a4f7c is described below

commit 0f871a4f7cc046cb273cc5abb2b9ef36006de2eb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jun 11 17:40:39 2024 +0200

    * doc/Makefile.am (pod2texi.texi), 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.
---
 ChangeLog              |  7 +++++++
 README-hacking         |  8 ++++++++
 doc/Makefile.am        |  2 +-
 doc/tp_api/Makefile.am | 11 ++++++-----
 tp/t/README            |  8 +++++---
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07de64ed03..5a0fc90e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@
        * info/infomap.c (locate_init_file) [__MINGW32__]:
        Add missing semicolon.  From Bruno.
 
+2024-06-11  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/Makefile.am (pod2texi.texi), 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-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/utils.c (non_perl_malloc): add.
diff --git a/README-hacking b/README-hacking
index 3e8f7b76fe..1508880938 100644
--- a/README-hacking
+++ b/README-hacking
@@ -183,6 +183,14 @@ the Perl interpreter found by configure, so you might want 
to run that
 instead of texi2any.pl if it's different to the default interpreter in 
 your environment.
 
+To directly run programs out of source, you should set the top_builddir
+variable to the top build directory, in order to have compiled modules
+and translated in-document strings found.  If you use scripts with
+names ending in .pl, the source directory obtained from the script name
+is used to determine the source directories and you do not need to set them
+explicitely.  Otherwise, you may need to set the srcdir and/or the
+top_srcdir variables.
+
 
 
 References for working on various parts of the system:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a44a55b47c..8d19470a2c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -41,7 +41,7 @@ if BUILD_PERL_API_TEXI
 # for the included section is therefore determined by the information
 # in the Pod file NAME section.
 $(srcdir)/pod2texi.texi: $(pod2texi_pl)
-       $(PERL) -I $(top_builddir)/tp -I $(top_builddir)/tp/Texinfo/XS -I 
$(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=subsubsection 
--no-section-nodes --headings-as-sections --subdir=$(srcdir) $(pod2texi_pl) > 
/dev/null
+       $(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
 
 TXI_MODULES_ENV = srcdir="$(srcdir)"; export srcdir;
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index 4a7332c620..f4f6967486 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -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
@@ -74,7 +75,7 @@ texi2any_internals_dependencies = \
   $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm
 
 texi2any_internals.texi: $(texi2any_internals_dependencies) 
texi2any_internals_indices.texi texi2any_internals_preamble.texi
-       if $(PERL) -I $(top_builddir)/tp -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 >$@.tmp ; then \
+       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 $@.tmp
 
diff --git a/tp/t/README b/tp/t/README
index d1c8246e74..0ae5e97059 100644
--- a/tp/t/README
+++ b/tp/t/README
@@ -31,10 +31,12 @@ Another way, which works when doing an out-of-source build, 
is
 Another way to run a test out-source is:
 
   s=../../tp
-  srcdir=$s ../pre-inst-env perl -w $s/t/92formatting.t empty
+  tb=../
+  srcdir=$s top_builddir=$tb perl -w $s/t/02coverage.t commands
 
-where s is the path to the srcdir.  This allows you to run specific
-sub-tests, here the sub-test with name "empty".
+where s is the path to the srcdir and tb is the path to the top build dir.
+This allows you to run specific sub-tests, here the sub-test with name
+"commands".
 
 Most test files use a testing infrastructure from t/test_utils.pl.
 The run_all function from that file runs the tests that have been