When stray trailing spaces leaked into build-aux/texinfo.texi,
config/srclist-update did not remove them.
* config/srclist-update (dsttmp): Remove; all uses removed.
---
 ChangeLog             |  7 +++++++
 config/srclist-update | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d496eb25e2..a62a22bb20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2026-10-19  Paul Eggert  <[email protected]>
+
+       srclist-update respects strip-trailing-space
+       When stray trailing spaces leaked into build-aux/texinfo.texi,
+       config/srclist-update did not remove them.
+       * config/srclist-update (dsttmp): Remove; all uses removed.
+
 2026-10-19  Bruno Haible  <[email protected]>
 
        Fix AC_CHECK_FUNC results with optimizing MSVC in a simpler way.
diff --git a/config/srclist-update b/config/srclist-update
index 0b217cfa3a..75f318ac59 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -54,7 +54,6 @@ verbose=false
 #chicken="echo (would)"
 
 : "${TMPDIR=/tmp}"
-dsttmp=$TMPDIR/srclist.dst
 
 # Source `dirname $0`/srclistvars.sh first, if it exists.
 mydir=`dirname $0`
@@ -165,11 +164,8 @@ cat | while read top src dst options; do
     fixfile $reltmp $reltmp
   fi
 
-  # Fix files in both src and dst, for the sake
-  # of a clean comparison.
   srctmp=$TMPDIR/`basename $src`
   fixfile $src $srctmp
-  test -r $dst && fixfile $dst $dsttmp
 
   # if src was executable, make dst executable, to placate git.
   test -x $src && chmod a+x $dst
@@ -177,14 +173,12 @@ cat | while read top src dst options; do
   if test ! -e $dst; then
     echo "## $srctmp $dst  # new"
     $chicken cp -p $srctmp $dst
-  elif $release && cmp -s $reltmp $dsttmp; then
+  elif $release && cmp -s $reltmp $dst; then
     $verbose && echo "## $reltmp $dst  # unchanged"
-  elif cmp -s $srctmp $dsttmp; then
+  elif cmp -s $srctmp $dst; then
     $verbose && echo "## $srctmp $dst  # unchanged"
   else
     echo "## $srctmp $dst  # changes"
     diff -C 2 $dst $srctmp
   fi
 done
-
-rm -f $dsttmp
-- 
2.56.0


Reply via email to