diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-05-04 09:43:05 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-05-04 09:43:05 +0200 |
| commit | cbbec352566be60d2ede1ee43f6bc911e547d8b0 (patch) | |
| tree | d61614d3eb0fb331611275dee4a820a0116403be | |
| parent | 4169d4de4a1217df3c44e56e737d8d5c2565e7bb (diff) | |
| download | gnulib-cbbec352566be60d2ede1ee43f6bc911e547d8b0.tar.gz | |
gendocs.sh: make its "-s FILE" option more useful
* build-aux/gendocs.sh: When honoring the -s FILE option, update
$PACKAGE to reflect the probably-different basename of "FILE".
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | build-aux/gendocs.sh | 12 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2010-05-04 Jim Meyering <meyering@redhat.com> + + gendocs.sh: make its "-s FILE" option more useful + * build-aux/gendocs.sh: When honoring the -s FILE option, update + $PACKAGE to reflect the probably-different basename of "FILE". + 2010-05-03 Giuseppe Scrivano <gscrivano@gnu.org> bootstrap: don't ignore download_po_files failure diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index 67d5b52cab..8cab8f6cdf 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -2,7 +2,7 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2010-02-13.20 +scriptversion=2010-05-04.09 # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. @@ -149,8 +149,16 @@ while test $# -gt 0; do shift done +# For most of the following, the base name is just $PACKAGE +base=$PACKAGE + if test -n "$srcfile"; then - : + # but here, we use the basename of $srcfile + base=`basename "$srcfile"` + case $base in + *.txi|*.texi|*.texinfo) base=`echo "$base"|sed 's/\.[texinfo]*$//'`;; + esac + PACKAGE=$base elif test -s "$srcdir/$PACKAGE.texinfo"; then srcfile=$srcdir/$PACKAGE.texinfo elif test -s "$srcdir/$PACKAGE.texi"; then |