branch master updated: * doc/Makefile.am (pod2texi.texi): add -I $(top_builddir)/tp/Texinfo/XS.

[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 6d63664146 * doc/Makefile.am (pod2texi.texi): add -I 
$(top_builddir)/tp/Texinfo/XS.
6d63664146 is described below

commit 6d63664146beed12c3fb0c6b8121d574a6afc06b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jun 11 14:23:26 2024 +0200

    * doc/Makefile.am (pod2texi.texi): add
    -I $(top_builddir)/tp/Texinfo/XS.
    
    * tp/Texinfo/ModulePath.pm.in (init): do not add
    tp/Texinfo/XS/parsetexi to @INC, there is nothing to be found there.
    
    * tp/Texinfo/ModulePath.pm.in ($tp_builddir),
    tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): rename builddir as
    tp_builddir.
---
 ChangeLog                            | 12 ++++++++++++
 doc/Makefile.am                      |  2 +-
 tp/Texinfo/ModulePath.pm.in          |  8 ++++----
 tp/Texinfo/XS/parsetexi/Parsetexi.xs |  4 ++--
 tp/Texinfo/XSLoader.pm               |  4 ++--
 tp/t/convert_to_text.t               |  2 +-
 tp/texi2any.pl                       |  2 +-
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcc9e1dceb..9f670aa5f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-06-11  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/Makefile.am (pod2texi.texi): add
+       -I $(top_builddir)/tp/Texinfo/XS.
+
+       * tp/Texinfo/ModulePath.pm.in (init): do not add
+       tp/Texinfo/XS/parsetexi to @INC, there is nothing to be found there.
+
+       * tp/Texinfo/ModulePath.pm.in ($tp_builddir),
+       tp/Texinfo/XS/parsetexi/Parsetexi.xs (init): rename builddir as
+       tp_builddir.
+
 2024-06-11  Patrice Dumas  <pertusus@free.fr>
 
        doc: prefix target file names in srcdir with '$(srcdir)/'
diff --git a/doc/Makefile.am b/doc/Makefile.am
index aa1def7f4c..a44a55b47c 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_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
+       $(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
 endif
 
 TXI_MODULES_ENV = srcdir="$(srcdir)"; export srcdir;
diff --git a/tp/Texinfo/ModulePath.pm.in b/tp/Texinfo/ModulePath.pm.in
index debfdea38c..855020d388 100644
--- a/tp/Texinfo/ModulePath.pm.in
+++ b/tp/Texinfo/ModulePath.pm.in
@@ -25,7 +25,7 @@ our $texinfo_uninstalled = 0;
 # uninstalled locations paths, if $Texinfo::ModulePath::texinfo_uninstalled
 # Pathname of the tp/ build directory.  Used to find the locale
 # data.
-our $builddir = '';
+our $tp_builddir = '';
 
 our $top_builddir;
 our $top_srcdir;
@@ -59,6 +59,7 @@ sub init {
     if ($ENV{'top_srcdir'}) {
       $top_srcdir = $ENV{'top_srcdir'};
     } elsif (defined $named_args{'updirs'}) {
+      # the command used is always in the source directory
       my ($real_command_name, $command_directory, $command_suffix)
               = fileparse($0, '.pl');
       my $updir = File::Spec->updir();
@@ -81,15 +82,14 @@ sub init {
     if (defined($ENV{'top_builddir'})) {
       $top_builddir = $ENV{'top_builddir'};
     } else {
+      # this is correct for in-source builds only.
       $top_builddir = $top_srcdir;
     }
     if (defined($top_builddir)) {
       unshift @INC, File::Spec->catdir($top_builddir, 'tp',
         'Texinfo', 'XS');
-      unshift @INC, File::Spec->catdir($top_builddir, 'tp',
-        'Texinfo', 'XS', 'parsetexi');
 
-      $builddir = File::Spec->catdir($top_builddir, 'tp');
+      $tp_builddir = File::Spec->catdir($top_builddir, 'tp');
     }
 
   } else {
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.xs 
b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
index 513bb58d13..682f55641a 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.xs
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.xs
@@ -55,9 +55,9 @@ PROTOTYPES: ENABLE
 # Called from Texinfo::XSLoader.pm.  The arguments are not actually used.
 # file path, can be in any encoding
 int
-init (texinfo_uninstalled, builddir)
+init (texinfo_uninstalled, tp_builddir)
      int texinfo_uninstalled
-     char *builddir = (char *)SvPVbyte_nolen ($arg);
+     char *tp_builddir = (char *)SvPVbyte_nolen ($arg);
 
 void
 reset_parser (int debug_output)
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 761a5d19ee..8cf630588c 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -27,7 +27,7 @@ BEGIN {
     # For configure test in TestXS.pm where Texinfo/ModulePath.pm may
     # not exist yet.
     $Texinfo::ModulePath::texinfo_uninstalled = 1;
-    $Texinfo::ModulePath::builddir = '';
+    $Texinfo::ModulePath::tp_builddir = '';
   }
 }
 
@@ -215,7 +215,7 @@ sub init {
 
   if (defined &{"${module}::init"}
       and !&{"${module}::init"} ($Texinfo::ModulePath::texinfo_uninstalled,
-                                 $Texinfo::ModulePath::builddir)) {
+                                 $Texinfo::ModulePath::tp_builddir)) {
     _fatal "$module_name: error initializing";
     goto FALLBACK;
   }
diff --git a/tp/t/convert_to_text.t b/tp/t/convert_to_text.t
index 4bb2f19f6f..a1c2d36995 100644
--- a/tp/t/convert_to_text.t
+++ b/tp/t/convert_to_text.t
@@ -40,7 +40,7 @@ use Texinfo::Convert::HTML;
 
 
 # setup translated strings
-my $locales_dir = File::Spec->catdir($Texinfo::ModulePath::builddir,
+my $locales_dir = File::Spec->catdir($Texinfo::ModulePath::tp_builddir,
                                      'LocaleData');
 my $strings_textdomain = 'texinfo_document';
 if (-d $locales_dir) {
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index a820f247a6..784c64e1db 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1310,7 +1310,7 @@ require Texinfo::Transformations;
 Texinfo::Transformations->import();
 
 if ($Texinfo::ModulePath::texinfo_uninstalled) {
-  my $locales_dir = File::Spec->catdir($Texinfo::ModulePath::builddir,
+  my $locales_dir = File::Spec->catdir($Texinfo::ModulePath::tp_builddir,
                                        'LocaleData');
   if (-d $locales_dir) {
     Texinfo::Translations::configure($locales_dir, $strings_textdomain);