From 71b8fa3dedfc8318e1b3e7691751332882ff267a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Aug 2013 11:01:13 -0700 Subject: [PATCH] accept doclicense option --- ChangeLog | 6 ++++++ config/srclist-update | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index ffbbeb6ad..5d17fbddd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-08-15 Karl Berry + + * config/srclist-update: add option "doclicense" to placate + pulling *.texi files from Emacs. Write terse usage + documentation at the top. + 2013-08-13 Paul Eggert xvasprintf-tests: port to GCC with hardening flags diff --git a/config/srclist-update b/config/srclist-update index ee7b2956e..2c597a04d 100755 --- a/config/srclist-update +++ b/config/srclist-update @@ -1,6 +1,20 @@ #!/bin/sh # Check for files in directory $1 being up to date, according to the # list on stdin. Don't actually make any changes, just show the diffs. +# +# Empty (or only whitespace) input lines are ignored. +# Lines beginning with # are ignored. +# Lines with just one word are ignored. +# Otherwise, the line has two or more whitespace-separated words: +# the first word is the source, the second word is the destination, +# other optional words are options. +# The possible options are "gpl" (to replace the license with the GPL) +# and "doclicense" (to replace @include doclicense.texi with fdl.texi). +# Unrecognized options are ignored. +# $VARIABLE expansions are done (with sh eval). +# +# This script is used in gnulib and texinfo; the input files are named +# srclist.txt. # # Copyright (C) 2002-2003, 2005, 2007-2013 Free Software Foundation, Inc. # @@ -83,6 +97,9 @@ fixfile() \ case " $options " in *' gpl '*) sed_command="$sed_command; $fixlicense";; + + *' doclicense '*) + sed_command="$sed_command; s/@include doclicense.texi/@include fdl.texi/";; esac sed "$sed_command" $1 >$2 -- 2.11.0