[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gendocs.sh: make its "-s FILE" option more useful
From: |
Jim Meyering |
Subject: |
[PATCH] gendocs.sh: make its "-s FILE" option more useful |
Date: |
Tue, 04 May 2010 09:44:34 +0200 |
One more piece required.
Without this, "gendocs.sh -s $(srcdir)/diff.texi" continued to try to
use names like diffutils.info, while only "diff.info" was generated.
>From cbbec352566be60d2ede1ee43f6bc911e547d8b0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 4 May 2010 09:43:05 +0200
Subject: [PATCH] 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".
---
ChangeLog | 6 ++++++
build-aux/gendocs.sh | 12 ++++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a439616..cb16e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-04 Jim Meyering <address@hidden>
+
+ 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 <address@hidden>
bootstrap: don't ignore download_po_files failure
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 67d5b52..8cab8f6 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
--
1.7.1.335.g6845a
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] gendocs.sh: make its "-s FILE" option more useful,
Jim Meyering <=