From d2517547d4761f0f8c0111039ea5f1c5866b8618 Mon Sep 17 00:00:00 2001
From: gerald <gerald@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 31 Mar 2007 23:11:28 +0000
Subject: [PATCH] 	* update_web_docs_svn (MANUALS): Move towards the top
 of the 	script.  Reformat for easier editing/diffing.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123391 138bc75d-0d04-0410-961f-82ee72b054a4
---
 maintainer-scripts/ChangeLog           |  5 +++++
 maintainer-scripts/update_web_docs_svn | 41 +++++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 04d14fb9a71..8ef1fc4765b 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-01  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* update_web_docs_svn (MANUALS): Move towards the top of the
+	script.  Reformat for easier editing/diffing.
+
 2006-03-31  Tobias Burnus  <burnus@net-b.de>
 
 	* update_web_docs_svn: Build also gfc-internals.
diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn
index 57d29cea7cf..a5879665cd5 100755
--- a/maintainer-scripts/update_web_docs_svn
+++ b/maintainer-scripts/update_web_docs_svn
@@ -11,6 +11,26 @@ export SVNROOT
 
 PATH=/usr/local/bin:$PATH
 
+MANUALS="cpp
+  cppinternals
+  fastjar
+  gcc
+  gccint
+  gcj
+  g77
+  gfortran
+  gfc-internals
+  gnat_ug_unx
+  gnat_ug_vms
+  gnat_ug_vxw
+  gnat_ug_wnt
+  gnat_ugn_unw
+  gnat-style
+  gnat_rm
+  libgomp
+  libiberty
+  porting"
+
 WWWBASE=/www/gcc/htdocs
 WWWBASE_PREFORMATTED=/www/gcc/htdocs-preformatted
 WWWPREPROCESS='/www/gcc/bin/preprocess -r'
@@ -109,8 +129,6 @@ tar cf docs-sources.tar gcc
 # and fdl.texi.
 includedir=gcc/gcc/doc/include
 
-MANUALS="cpp cppinternals fastjar gcc gccint gcj g77 gfortran gfc-internals gnat_ug_unx gnat_ug_vms gnat_ug_vxw gnat_ug_wnt gnat_ugn_unw gnat-style gnat_rm libgomp libiberty porting"
-
 # Generate gnat_ugn_unw
 
 if [ -f gcc/gcc/ada/xgnatugn.adb ]; then
@@ -157,7 +175,7 @@ if test $today = 15; then
   done
 fi
 
-# And copy the resulting files to the web server
+# Copy the resulting files to the web server.
 for file in */*.html *.ps *.pdf *.tar; do
   if [ -f $DOCSDIR/$file ]; then
     cat $DOCSDIR/$file | 
@@ -177,19 +195,26 @@ done
 
 cd $DOCSDIR
 
-# Finally, generate the installation documentation
+# And generate version-specific installation documentation.
+SOURCEDIR=$WORKDIR/gcc/gcc/doc
+DESTDIR=$DOCSDOR/install
+export SOURCEDIR
+export DESTDIR
+$WORKDIR/gcc/gcc/doc/install.texi2html
+
+# Finally, generate the primary installation documentation.
 if [ "$RELEASE" = "trunk" ]; then
   SOURCEDIR=$WORKDIR/gcc/gcc/doc
   DESTDIR=$WWWBASE_PREFORMATTED/install
   export SOURCEDIR
   export DESTDIR
   $WORKDIR/gcc/gcc/doc/install.texi2html
-
-  # Preprocess the entire web site, not just the install docs!
-  echo "Invoking $WWWPREPROCESS"
-  $WWWPREPROCESS |grep -v '^  Warning: Keeping'
 fi
 
+# Preprocess the entire web site, not just the install docs!
+echo "Invoking $WWWPREPROCESS"
+$WWWPREPROCESS | grep -v '^  Warning: Keeping'
+
 # Clean up behind us.
 
 rm -rf $WORKDIR
-- 
2.11.0