texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Gavin D. Smith
Date: Wed, 19 Oct 2022 08:30:58 -0400 (EDT)

branch: master
commit 5d4a2299b1a96bbd8755f408fc33ab1ed1f68208
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Oct 19 12:59:24 2022 +0100

    * util/srclist-txi, util/srclist.txt: Remove handing of
    automake files as "autoreconf" should take care of this.
---
 ChangeLog        | 5 +++++
 util/srclist-txi | 4 +---
 util/srclist.txt | 8 +-------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c46bed6cf3..9094e61682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-19  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * util/srclist-txi, util/srclist.txt: Remove handing of
+       automake files as "autoreconf" should take care of this.
+
 2022-10-19  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * README-hacking: Edit instructions on gnulib upgrade.
diff --git a/util/srclist-txi b/util/srclist-txi
index fd2a4965d7..5ec69b52c4 100755
--- a/util/srclist-txi
+++ b/util/srclist-txi
@@ -2,7 +2,7 @@
 # Texinfo's wrapper for the Gnulib script config/srclist-update,
 # to define particular variables our srclist.txt uses.
 # 
-# Copyright 2013-2021 Free Software Foundation, Inc.
+# Copyright 2013-2022 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -15,12 +15,10 @@
 # per-user overrides.
 case $LOGNAME in
 karl)
-  : ${AUTOMAKE=/usr/local/gnu/share/automake-1.15}; export AUTOMAKE
   : ${GNULIB=$HOME/gnu/src/gnulib};                 export GNULIB
   ;;
 g)
   : ${GNULIB=$HOME/src/texinfo/gnulib} ; export GNULIB
-  : ${AUTOMAKE=$HOME/extsrc/automake-1.16.3} ; export AUTOMAKE
 esac
 
 mydir=`dirname $0`
diff --git a/util/srclist.txt b/util/srclist.txt
index af9d21a42e..a63c4bc0d5 100644
--- a/util/srclist.txt
+++ b/util/srclist.txt
@@ -2,7 +2,7 @@
 # This is input for the script config/srclist-update in the gnulib
 # project on savannah, and the wrapper srclist-txi in this directory.
 # 
-# Copyright 2002-2021 Free Software Foundation, Inc.
+# Copyright 2002-2022 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -26,9 +26,3 @@ $GNULIB build-aux/mdate-sh            build-aux
 $GNULIB doc/COPYINGv3                  ./COPYING
 $GNULIB doc/INSTALL                    ./INSTALL.generic
 $GNULIB doc/fdl.texi                   doc
-
-
-# Should only need to be updated after major Automake releases.
-$AUTOMAKE lib/tap-driver.sh            build-aux
-$AUTOMAKE lib/test-driver              build-aux
-$AUTOMAKE lib/missing                  build-aux



reply via email to

[Prev in Thread] Current Thread [Next in Thread]