diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-21 11:30:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-08-21 11:37:41 -0700 |
| commit | 63bd32fd4232cb916a683cecebf954e678360aec (patch) | |
| tree | c3c5401a0143583ef95de59857e13a8524ea03db /config | |
| parent | e014d20b39510dce9947655fad15192ec519786f (diff) | |
| download | gnulib-63bd32fd4232cb916a683cecebf954e678360aec.tar.gz | |
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.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/srclist-update | 10 | ||||
| -rw-r--r-- | config/srclist.txt | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/config/srclist-update b/config/srclist-update index b90ef15444..e57ba4eafb 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. # @@ -101,6 +102,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 bb6ad87abd..6d37729cef 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 |