[no subject]

[Gavin D. Smith]

branch: release/7.1
commit b343745a63ee8396a302b245f87fef9a088381e5
Author: Bruno Haible <bruno@clisp.org>
AuthorDate: Thu Aug 8 19:26:47 2024 +0100

    * texindex/Makefile.am (texindex.awk): Move the generated
    texindex.awk from the build dir to the source dir.
    
    * man/Makefile.am (man/Makefile.am): Set environment variable
    TEXINDEX_SCRIPT, so that the texindex program find its
    texindex.awk script.
---
 ChangeLog            | 9 +++++++++
 man/Makefile.am      | 5 ++++-
 texindex/Makefile.am | 3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a0b5b4a36..66875dd2a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-08-08  Bruno Haible  <bruno@clisp.org>
+
+       * texindex/Makefile.am (texindex.awk): Move the generated
+       texindex.awk from the build dir to the source dir.
+
+       * man/Makefile.am (man/Makefile.am): Set environment variable
+       TEXINDEX_SCRIPT, so that the texindex program find its
+       texindex.awk script.
+
 2024-07-26  Patrice Dumas  <pertusus@free.fr>
 
        * doc/Makefile.am (MAINTAINERCLEANFILES): set generated Texinfo files
diff --git a/man/Makefile.am b/man/Makefile.am
index 353cd6441f..35cb10780f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -95,7 +95,10 @@ $(srcdir)/makeinfo.1: $(tpdir)/texi2any.pl $(common_mandeps)
        rm $@.tmp
 
 $(srcdir)/texindex.1: $(top_srcdir)/texindex/ti.twjr $(common_mandeps)
-       @name="sort Texinfo index files" && $(man_rule_bin)
+       @name="sort Texinfo index files" \
+         && TEXINDEX_SCRIPT=$(top_srcdir)/texindex/texindex.awk \
+         && export TEXINDEX_SCRIPT \
+         && $(man_rule_bin)
 
 # 
 # For texi2dvi, do not depend on the current user's settings.
diff --git a/texindex/Makefile.am b/texindex/Makefile.am
index 9fec5f2247..135df23a03 100644
--- a/texindex/Makefile.am
+++ b/texindex/Makefile.am
@@ -54,7 +54,8 @@ texindex: texindex.in Makefile
 texindex.awk: ti.twjr
        $(GAWK) -f $(srcdir)/jrtangle $(srcdir)/ti.twjr || rm -f texindex.awk
        $(do_subst) <texindex.awk >texindex.awk-tmp
-       mv texindex.awk-tmp texindex.awk
+       rm -f texindex.awk
+       mv texindex.awk-tmp $(srcdir)/texindex.awk
 
 # how to build the pdf of the program-as-document.
 ti.pdf: ti.texi