>From 63bd32fd4232cb916a683cecebf954e678360aec Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Wed, 21 Aug 2019 11:30:10 -0700
Subject: [PATCH] New strip-trailing-space option for srclist-update

* config/srclist-update (fixfile): Support new option.
* config/srclist.txt (texinfo.tex, maintain.texi, standards.texi):
Use it.
---
 ChangeLog             |  7 +++++++
 config/srclist-update | 10 ++++++++--
 config/srclist.txt    |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5eda2fa3..d76da745b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-08-21  Paul Eggert  <address@hidden>
+
+	New strip-trailing-space option for srclist-update
+	* config/srclist-update (fixfile): Support new option.
+	* config/srclist.txt (texinfo.tex, maintain.texi, standards.texi):
+	Use it.
+
 2019-08-20  Eric Blake  <address@hidden>
 
 	accept4: Support SOCK_NONBLOCK, if defined
diff --git a/config/srclist-update b/config/srclist-update
index b90ef1544..e57ba4eaf 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -14,6 +14,7 @@
 #   options.
 # The possible options are "gpl" (to replace the license with the GPL)
 #   and "doclicense" (to replace @include doclicense.texi with fdl.texi)
+#   and "strip-trailing-space" (to strip trailing white space from lines)
 #   and "release" (to use the release version instead of the
 #   development version).
 #   Unrecognized options are ignored.
@@ -91,8 +92,8 @@ fixlicense='
 # Quote the $ so that CVS does not expand it in this script.
 remove_id_lines='/[$]Id:.*[$]/d'
 
-# $1 is the root directory of input file, $2 is input file, $3 is
-# output.  Remove $Id lines, since they'll differ between source
+# $1 is input file, $2 is output.
+# Remove $Id lines, since they'll differ between source
 # locations.  If $options contains "gpl", change the license to be the
 # standard GPL.  We use this for libc files, et al.
 #
@@ -100,6 +101,11 @@ fixfile() \
 {
   sed_command="$remove_id_lines"
 
+  case " $options " in
+  *' strip-trailing-space '*)
+    sed_command="$sed_command; s/[[:space:]]*\$//";;
+  esac
+
   case " $options " in
   *' gpl '*)
     sed_command="$sed_command; $fixlicense";;
diff --git a/config/srclist.txt b/config/srclist.txt
index bb6ad87ab..6d37729ce 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -12,13 +12,13 @@ $AUTOMAKE lib/install-sh	build-aux
 $AUTOMAKE lib/mdate-sh		build-aux
 $AUTOMAKE lib/mkinstalldirs	build-aux
 
-$TEXINFOTEX texinfo.tex		build-aux
+$TEXINFOTEX texinfo.tex		build-aux strip-trailing-space
 
 # we generate INSTALL from this via a rule in doc/Makefile.
 $AUTOCONF doc/install.texi	doc
 
-$GNUSTANDARDS maintain.texi	doc
-$GNUSTANDARDS standards.texi	doc
+$GNUSTANDARDS maintain.texi	doc strip-trailing-space
+$GNUSTANDARDS standards.texi	doc strip-trailing-space
 $GNUSTANDARDS make-stds.texi	doc
 $GNUSTANDARDS gnu-oids.texi	doc
 $GNUSTANDARDS fdl.texi		doc
-- 
2.17.1