[no subject]

[Gavin D. Smith]

branch: master
commit 9f245be3feef9dc63e84769192bb7bc9c553d67a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Oct 24 14:23:57 2024 +0100

    * autogen.sh: Call autoreconf instead of individual tools,
    with autopoint disabled.  Do not specify --force as this
    overwrites INSTALL.
---
 ChangeLog  |  6 ++++++
 autogen.sh | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e92b690dc2..3e6f4b671e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-10-24  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * autogen.sh: Call autoreconf instead of individual tools,
+       with autopoint disabled.  Do not specify --force as this
+       overwrites INSTALL.
+
 2024-10-24  Gavin Smith <gavinsmith0123@gmail.com>
 
        * NEWS: automake 1.17
diff --git a/autogen.sh b/autogen.sh
index 24475d24e2..db611c799d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,21 +34,13 @@ if test '!' -s doc/tp_api/texi2any_internals.texi ; then
   $chicken eval $cmd || exit 1
 fi
 
-# This overwrites lots of files with older versions.
-#cmd="autoreconf --verbose --force --install --include=m4"
-
-# So instead:
-: ${ACLOCAL=aclocal}
-: ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake}
-: ${AUTOCONF=autoconf}
-cmd="$ACLOCAL -I build-aux/m4 -I gnulib/m4 && $AUTOCONF && $AUTOHEADER && 
$AUTOMAKE -a -c"
+cmd="AUTOPOINT=true autoreconf --verbose --install"
 echo "  $cmd"
 $chicken eval $cmd || exit 1
 
 : ${LIBTOOLIZE=libtoolize}
 cmd="(cd tp/Texinfo/XS && ${LIBTOOLIZE} \
- && AUTOPOINT=true autoreconf --force --verbose --install)"
+ && AUTOPOINT=true autoreconf --verbose --install)"
 echo "  $cmd"
 $chicken eval $cmd || exit 1
 # We set AUTOPOINT=true to avoid rewriting files with older versions.