From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 759 invoked by alias); 2 Apr 2008 22:28:35 -0000 Received: (qmail 733 invoked by uid 367); 2 Apr 2008 22:28:35 -0000 Date: Wed, 02 Apr 2008 22:28:00 -0000 Message-ID: <20080402222835.718.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Fix "upload-manpages". X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 46d2f6c9241d74c5ce051beed0687143209f80a7 X-Git-Newrev: 3a267df6b1a76f01ac0b8c796794a41ddf111cb9 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00025.txt.bz2 The branch, master has been updated via 3a267df6b1a76f01ac0b8c796794a41ddf111cb9 (commit) from 46d2f6c9241d74c5ce051beed0687143209f80a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 3a267df6b1a76f01ac0b8c796794a41ddf111cb9 Author: Andrew Cagney Date: Wed Apr 2 18:27:39 2008 -0400 Fix "upload-manpages". frysk-common/ChangeLog 2008-04-02 Andrew Cagney * manpages.sh: Recognize ENTITY volumes. frysk-top/ChangeLog 2008-04-02 Andrew Cagney * Makefile.am (manpages): Make un-conditional. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 2 ++ frysk-common/manpages.sh | 5 ++++- frysk-top/ChangeLog | 2 ++ frysk-top/Makefile.am | 3 +-- 4 files changed, 9 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 1165e19..b2ede63 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,7 @@ 2008-04-02 Andrew Cagney + * manpages.sh: Recognize ENTITY volumes. + * Makefile.gen.sh (.xml): Recognize ENTITY volumes and names. 2008-03-31 Andrew Cagney diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh index a6e6229..63c1168 100755 --- a/frysk-common/manpages.sh +++ b/frysk-common/manpages.sh @@ -68,7 +68,10 @@ EOF suffix="" else name=`basename $xmlfile .xml` - n=`sed -n -e 's,.*\([0-9]\).*,\1,p' < $xmlfile` + n=`sed -n < $xmlfile \ + -e 's,.*\([0-9]\).*,\1,p' \ + -e 's,.*ENTITY volume "\([0-9]\)".*,\1,p' \ + ` echo "Generating man webpage for ${name}.${n}" 1>&2 sed -e "s;@abs_root_srcdir@;${abs_root_srcdir};g" \ < $xmlfile \ diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog index 206efa1..e8a0ad7 100644 --- a/frysk-top/ChangeLog +++ b/frysk-top/ChangeLog @@ -1,5 +1,7 @@ 2008-04-02 Andrew Cagney + * Makefile.am (manpages): Make un-conditional. + * NEWS: Seed. 2008-03-31 Andrew Cagney diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am index 3b5a1b2..6c45b4b 100644 --- a/frysk-top/Makefile.am +++ b/frysk-top/Makefile.am @@ -75,8 +75,7 @@ SOURCEDIRS = \ TEMPLATE = $(srcdir)/htdocs/template.html .PHONY: manpages -manpages: manpages/index.html -manpages/index.html: +manpages manpages/index.html: rm -rf manpages mkdir -p manpages XMLTO=$(XMLTO) \ hooks/post-receive -- frysk system monitor/debugger