texinfo ChangeLog util/gendocs.sh

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/05/06 13:29:58

Modified files:
        .              : ChangeLog 
        util           : gendocs.sh 

Log message:
        gendocs.sh update from gnulib

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1043&r2=1.1044
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/gendocs.sh?cvsroot=texinfo&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -b -r1.1043 -r1.1044
--- ChangeLog   23 Apr 2010 13:56:25 -0000      1.1043
+++ ChangeLog   6 May 2010 13:29:58 -0000       1.1044
@@ -1,3 +1,9 @@
+2010-05-04  Jim Meyering  <address@hidden>
+
+       * util/gendocs.sh: make its "-s FILE" option more useful;
+       when honoring the -s FILE option, update
+       $PACKAGE to reflect the probably-different basename of "FILE".
+
 2010-04-23  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\,, \dotaccent, \tieaccents, \ubaraccent): use

Index: util/gendocs.sh
===================================================================
RCS file: /sources/texinfo/texinfo/util/gendocs.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- util/gendocs.sh     14 Feb 2010 23:19:52 -0000      1.33
+++ util/gendocs.sh     6 May 2010 13:29:58 -0000       1.34
@@ -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 @@
   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