[no subject]

[Gavin D. Smith]

branch: master
commit e9523979c49dbb1b22f50f16375e84b4eaa9b983
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Aug 7 01:21:41 2024 +0100

    * doc/Makefile.am (pod2texi.texi): Add dependency on pod2texi
    and run pod2texi instead of pod2texi.pl.
    * Pod-Simple-Texinfo/Makefile.am (pod2texi): Add dependency on
    tp/Texinfo/ModulePath.pm.
---
 ChangeLog                      | 7 +++++++
 Pod-Simple-Texinfo/Makefile.am | 6 +++++-
 doc/Makefile.am                | 7 +++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 977a83887d..847b695724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-08-07  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/Makefile.am (pod2texi.texi): Add dependency on pod2texi
+       and run pod2texi instead of pod2texi.pl.
+       * Pod-Simple-Texinfo/Makefile.am (pod2texi): Add dependency on
+       tp/Texinfo/ModulePath.pm.
+
 2024-08-06  Gavin Smith <gavinsmith0123@gmail.com>
 
        * configure.ac: adjust a comment so that aclocal does not think
diff --git a/Pod-Simple-Texinfo/Makefile.am b/Pod-Simple-Texinfo/Makefile.am
index eaa31505f1..1f833cd525 100644
--- a/Pod-Simple-Texinfo/Makefile.am
+++ b/Pod-Simple-Texinfo/Makefile.am
@@ -31,7 +31,11 @@ modulesdir = $(pkgdatadir)/Pod-Simple-Texinfo/Pod/Simple/
 dist_modules_DATA = \
  lib/Pod/Simple/Texinfo.pm
 
-pod2texi: pod2texi.pl Makefile
+# Needed if make has not run in the "tp" directory yet
+$(top_builddir)/tp/Texinfo/ModulePath.pm:
+       cd $(top_builddir)/tp && $(MAKE) $(AM_MAKEFLAGS) Texinfo/ModulePath.pm
+
+pod2texi: pod2texi.pl Makefile $(top_builddir)/tp/Texinfo/ModulePath.pm
        sed -e 's,[@]datadir[@],$(datadir),g' \
        -e 's,[@]pkglibdir[@],$(pkglibdir),g' \
        -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 25b4e2c8e4..6d686be6d5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,6 +33,9 @@ TEXI2DVI = $(TEXI2DVI_ENVIRONMENT) $(top_srcdir)/util/texi2dvi
 # include pod2texi in the main manual
 pod2texi_pl = $(abs_top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
 
+$(top_builddir)/Pod-Simple-Texinfo/pod2texi:
+       cd $(top_builddir)/Pod-Simple-Texinfo && $(MAKE) $(AM_MAKEFLAGS) 
pod2texi
+
 if BUILD_PERL_API_TEXI
 # we setup the conversion to Texinfo for inclusion in a document,
 # but we ignore the main document (output to /dev/null) that includes
@@ -40,8 +43,8 @@ if BUILD_PERL_API_TEXI
 # 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
+$(srcdir)/pod2texi.texi: $(pod2texi_pl) 
$(top_builddir)/Pod-Simple-Texinfo/pod2texi
+       $(MAKEINFO_ENVIRONMENT) $(PERL) -I 
$(top_srcdir)/Pod-Simple-Texinfo/lib/ 
$(top_builddir)/Pod-Simple-Texinfo/pod2texi --base-level=subsubsection 
--no-section-nodes --headings-as-sections --subdir=$(srcdir) $(pod2texi_pl) > 
/dev/null
 endif
 
 TXI_MODULES_ENV = srcdir="$(srcdir)"; export srcdir;