[SCM] master: Get html fstack man page working.

[cagney at sourceware dot org]

The branch, master has been updated
       via  b12abe2ed615acb2de7c967882c29b27b3bfbd66 (commit)
      from  888eca8cb8d14ed37d0901755701c817d79381fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit b12abe2ed615acb2de7c967882c29b27b3bfbd66
Author: Andrew Cagney <cagney@redhat.com>
Date:   Mon Mar 31 15:26:31 2008 -0400

    Get html fstack man page working.
    
    frysk-common/ChangeLog
    2008-03-31  Andrew Cagney  <cagney@redhat.com>
    
    	* manpages.sh: Handle @abs_root_srcdir@.
    
    frysk-core/frysk/bindir/ChangeLog
    2008-03-31  Andrew Cagney  <cagney@redhat.com>
    
    	* fstack.xml: Use abs_root_srcdir when specifying paths.
    
    frysk-top/ChangeLog
    2008-03-31  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.am (upload-manpages): Explicitly depend on
    	manpages/index.html.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog             |    4 ++++
 frysk-common/manpages.sh           |    8 +++++++-
 frysk-core/frysk/bindir/ChangeLog  |    2 ++
 frysk-core/frysk/bindir/fstack.xml |    6 +++---
 frysk-top/ChangeLog                |    5 +++++
 frysk-top/Makefile.am              |   16 +++++++++-------
 6 files changed, 30 insertions(+), 11 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 51bc295..ce6ebd0 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-31  Andrew Cagney  <cagney@redhat.com>
+
+	* manpages.sh: Handle @abs_root_srcdir@.
+
 2008-03-18  Andrew Cagney  <cagney@redhat.com>
 
 	* frysk-common.ac (--enable-jar-compile): Default to yes.
diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh
index 98bff63..a6e6229 100755
--- a/frysk-common/manpages.sh
+++ b/frysk-common/manpages.sh
@@ -43,6 +43,8 @@ if [ $# -lt 1 ]; then
     exit 1
 fi
 
+abs_root_srcdir=$(cd $(dirname $(dirname $0)) && /bin/pwd)
+
 XMLTO=${XMLTO:-xmlto}
 template=$1 ; shift
 exec > manpages/index.new
@@ -68,7 +70,11 @@ EOF
 	name=`basename $xmlfile .xml`
 	n=`sed -n -e 's,.*<manvolnum>\([0-9]\)</manvolnum>.*,\1,p' < $xmlfile`
 	echo "Generating man webpage for ${name}.${n}" 1>&2
-	${XMLTO} -o manpages html $xmlfile 
+	sed -e "s;@abs_root_srcdir@;${abs_root_srcdir};g" \
+	    < $xmlfile \
+	    > manpages/${name}.${n}.tmp
+	${XMLTO} -o manpages html manpages/${name}.${n}.tmp
+	rm -f manpages/${name}.${n}.tmp
 	mv manpages/index.html manpages/${name}.${n}.html 
 	
 	cat <<EOF
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index aec0252..86abbed 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-31  Andrew Cagney  <cagney@redhat.com>
 
+	* fstack.xml: Use abs_root_srcdir when specifying paths.
+	
 	* fstack.xml: Use stack-options.xml, standard-options.xml, and
 	version.in.
 
diff --git a/frysk-core/frysk/bindir/fstack.xml b/frysk-core/frysk/bindir/fstack.xml
index 6dca143..4ce5033 100644
--- a/frysk-core/frysk/bindir/fstack.xml
+++ b/frysk-core/frysk/bindir/fstack.xml
@@ -47,9 +47,9 @@
  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";
 
  [
- <!ENTITY stackoptions SYSTEM "@abs_srcdir@/frysk/util/stack-options.xml">
- <!ENTITY standardoptions SYSTEM "@abs_srcdir@/frysk/util/standard-options.xml">
- <!ENTITY version SYSTEM "@abs_srcdir@/common/version.in">
+ <!ENTITY stackoptions SYSTEM "@abs_root_srcdir@/frysk-core/frysk/util/stack-options.xml">
+ <!ENTITY standardoptions SYSTEM "@abs_root_srcdir@/frysk-core/frysk/util/standard-options.xml">
+ <!ENTITY version SYSTEM "@abs_root_srcdir@/common/version.in">
  ]
 >
 
diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
index 04964fb..3f68aee 100644
--- a/frysk-top/ChangeLog
+++ b/frysk-top/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-31  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.am (upload-manpages): Explicitly depend on
+	manpages/index.html.
+
 2008-03-14  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.am (frysk-common/frysk.7): New target.
diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
index 8a81016..3b5a1b2 100644
--- a/frysk-top/Makefile.am
+++ b/frysk-top/Makefile.am
@@ -67,14 +67,16 @@ SOURCEDIRS = \
 	$(empty)
 
 
-# Generate html manpages
-# Use same xml sources, but generate html.
-# html is always put in index.html in output dir, so rename.
-# Use template file and just put in title, logo and a list of utils + href.
-# Replace ./ with ../ relative references (manpages is one dir down).
+# Generate html manpages.  Use same xml sources, but generate html.
+# html is always put in index.html in output dir, so rename.  Use
+# template file and just put in title, logo and a list of utils +
+# href.  Replace ./ with ../ relative references (manpages is one dir
+# down).
+
 TEMPLATE = $(srcdir)/htdocs/template.html
 .PHONY: manpages
-manpages:
+manpages: manpages/index.html
+manpages/index.html:
 	rm -rf manpages
 	mkdir -p manpages
 	XMLTO=$(XMLTO) \
@@ -191,7 +193,7 @@ upload-javadoc:
 CLEANFILES += javadoc
 
 .PHONY: upload-manpages
-upload-manpages:
+upload-manpages: manpages/index.html
 	$(UPLOAD) \
 		manpages/ \
 		sourceware.org:/sourceware/www/sourceware/htdocs/frysk/manpages


hooks/post-receive
--
frysk system monitor/debugger