branch master updated: * doc/tp_api/Makefile.am (texi2any_internals.texi): Change working directory to $(srcdir) before running pod2texi. This allows pod2texi to generate @include directives correctly with the --subdir option. (texi2any_internals_dependencies): List dependencies with ../../ prefix instead of $(top_srcdir)/. (MAKEINFO_ENVIRONMENT): Use abs_top_srcdir and abs_top_buildir instead of top_srcdir and top_buildir.

[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 18528c419a * doc/tp_api/Makefile.am (texi2any_internals.texi): Change 
working directory to $(srcdir) before running pod2texi. This allows pod2texi to 
generate @include directives correctly with the --subdir option. 
(texi2any_internals_dependencies): List dependencies with ../../ prefix instead 
of $(top_srcdir)/. (MAKEINFO_ENVIRONMENT): Use abs_top_srcdir and 
abs_top_buildir instead of top_srcdir and top_buildir.
18528c419a is described below

commit 18528c419aa7445c15462f07454a1b4a9b7ab917
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Aug 10 13:02:30 2024 +0100

    * doc/tp_api/Makefile.am (texi2any_internals.texi):
    Change working directory to $(srcdir) before running pod2texi.
    This allows pod2texi to generate @include directives correctly
    with the --subdir option.
    (texi2any_internals_dependencies): List dependencies with
    ../../ prefix instead of $(top_srcdir)/.
    (MAKEINFO_ENVIRONMENT): Use abs_top_srcdir and abs_top_buildir
    instead of top_srcdir and top_buildir.
    
    Analysis by Patrice.
---
 ChangeLog              | 13 +++++++++++
 doc/tp_api/Makefile.am | 63 +++++++++++++++++++++++++++-----------------------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf09c2a56b..4fa678f742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-08-10  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/tp_api/Makefile.am (texi2any_internals.texi):
+       Change working directory to $(srcdir) before running pod2texi.
+       This allows pod2texi to generate @include directives correctly
+       with the --subdir option.
+       (texi2any_internals_dependencies): List dependencies with
+       ../../ prefix instead of $(top_srcdir)/.
+       (MAKEINFO_ENVIRONMENT): Use abs_top_srcdir and abs_top_buildir
+       instead of top_srcdir and top_buildir.
+
+       Analysis by Patrice.
+
 2024-08-09  Patrice Dumas  <pertusus@free.fr>
 
        Use prototypes instead of old style K&R definitions
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index 677c793232..7527431611 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -14,10 +14,11 @@
 # texi2any_internals_indices.texi does 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.
+# Use the programs built in our distribution.  Use absolute directory
+# names so we can run from a different working directory.
 MAKEINFO_ENVIRONMENT = TEXINFO_DEV_SOURCE=1 \
-                       top_srcdir="$(top_srcdir)" \
-                       top_builddir="$(top_builddir)"
+                       top_srcdir="$(abs_top_srcdir)" \
+                       top_builddir="$(abs_top_builddir)"
 MAKEINFO = $(MAKEINFO_ENVIRONMENT) $(PERL) $(top_srcdir)/tp/texi2any.pl
 
 TEXI2DVI_ENVIRONMENT = TEXINDEX=${abs_top_builddir}/texindex/texindex \
@@ -53,35 +54,39 @@ BUILT_SOURCES = texi2any_internals.texi
 
 # all the modules with some interesting public interfaces.
 # The order matters for the result.
+# Note that these relative file names are correct from srcdir, and will be
+# found from builddir in VPATH builds.
 texi2any_internals_dependencies = \
-  $(top_srcdir)/tp/Texinfo/Commands.pod \
-  $(top_srcdir)/tp/Texinfo/Common.pm \
-  $(top_srcdir)/tp/Texinfo/ParserNonXS.pm \
-  $(top_srcdir)/tp/Texinfo/Document.pm \
-  $(top_srcdir)/tp/Texinfo/ManipulateTree.pm \
-  $(top_srcdir)/tp/Texinfo/Structuring.pm \
-  $(top_srcdir)/tp/Texinfo/Report.pm \
-  $(top_srcdir)/tp/Texinfo/Translations.pm \
-  $(top_srcdir)/tp/Texinfo/Transformations.pm \
-  $(top_srcdir)/tp/Texinfo/Indices.pm \
-  $(top_srcdir)/tp/Texinfo/OutputUnits.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Texinfo.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Utils.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Unicode.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/NodeNameNormalization.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Text.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Converter.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Info.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/HTML.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/DocBook.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/TexinfoMarkup.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/TexinfoXML.pm \
-  $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm
+  ../../tp/Texinfo/Commands.pod \
+  ../../tp/Texinfo/Common.pm \
+  ../../tp/Texinfo/ParserNonXS.pm \
+  ../../tp/Texinfo/Document.pm \
+  ../../tp/Texinfo/ManipulateTree.pm \
+  ../../tp/Texinfo/Structuring.pm \
+  ../../tp/Texinfo/Report.pm \
+  ../../tp/Texinfo/Translations.pm \
+  ../../tp/Texinfo/Transformations.pm \
+  ../../tp/Texinfo/Indices.pm \
+  ../../tp/Texinfo/OutputUnits.pm \
+  ../../tp/Texinfo/Convert/Texinfo.pm \
+  ../../tp/Texinfo/Convert/Utils.pm \
+  ../../tp/Texinfo/Convert/Unicode.pm \
+  ../../tp/Texinfo/Convert/NodeNameNormalization.pm \
+  ../../tp/Texinfo/Convert/Text.pm \
+  ../../tp/Texinfo/Convert/Converter.pm \
+  ../../tp/Texinfo/Convert/Info.pm \
+  ../../tp/Texinfo/Convert/HTML.pm \
+  ../../tp/Texinfo/Convert/DocBook.pm \
+  ../../tp/Texinfo/Convert/TexinfoMarkup.pm \
+  ../../tp/Texinfo/Convert/TexinfoXML.pm \
+  ../../tp/Texinfo/Convert/Plaintext.pm
 
 $(srcdir)/texi2any_internals.texi: $(texi2any_internals_dependencies) 
$(srcdir)/texi2any_internals_indices.texi 
$(srcdir)/texi2any_internals_preamble.texi
-       if $(MAKEINFO_ENVIRONMENT) $(PERL) -I 
$(top_srcdir)/Pod-Simple-Texinfo/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - 
--subdir=$(srcdir)/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
+       cd $(srcdir) ; \
+       target=texi2any_internals.texi ; \
+       if $(MAKEINFO_ENVIRONMENT) $(PERL) -I ../../Pod-Simple-Texinfo/lib/ 
../../Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - 
--subdir=api_includes $(texi2any_internals_dependencies) < 
texi2any_internals_preamble.texi >$${target}.tmp ; then \
+         cat $${target}.tmp  | sed -e 's/^@bye/@__bye/' | sed -e '/^@__bye/r 
texi2any_internals_indices.texi' | sed -e 's/^@__bye//' > $${target} ; \
+       fi ; rm -f $${target}.tmp
 
 endif