* doc/gcc.texi: Don't include install-old.texi. Adjust menu

	description for Trouble section.
	* doc/install-old.texi: Adjust for inclusion as chapter of new
	installation manual.
	* doc/install.texi, doc/include/fdl.texi, doc/install.texi2html:
	Adjust to include old installation chapter as chapter of new
	installation manual.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47757 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 107 insertions, 22 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c11b636392..143aa204ab0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-07  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* doc/gcc.texi: Don't include install-old.texi.  Adjust menu
+	description for Trouble section.
+	* doc/install-old.texi: Adjust for inclusion as chapter of new
+	installation manual.
+	* doc/install.texi, doc/include/fdl.texi, doc/install.texi2html:
+	Adjust to include old installation chapter as chapter of new
+	installation manual.
+
 Fri Dec  7 11:07:35 EST 2001  John Wehle  (john@feith.com)
 
 	* rtl.h (get_jump_table_offset): Declare.
diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi
index a1f4e2e0433..67ea96a7518 100644
--- a/gcc/doc/gcc.texi
+++ b/gcc/doc/gcc.texi
@@ -239,13 +239,12 @@ bugs.  It corresponds to GCC version 3.1.
 * G++ and GCC::     You can compile C or C++ programs.
 * Standards::       Language standards supported by GCC.
 * Invoking GCC::    Command options supported by @samp{gcc}.
-* Installation::    How to configure, compile and install GCC (out of date).
 * C Implementation:: How GCC implements the ISO C specification.
 * C Extensions::    GNU extensions to the C language family.
 * C++ Extensions::  GNU extensions to the C++ language.
 * Objective-C::     GNU Objective-C runtime features.
 * Gcov::	    gcov: a GCC test coverage program.
-* Trouble::         If you have trouble installing GCC.
+* Trouble::         If you have trouble using GCC.
 * Bugs::            How, why and where to report bugs.
 * Service::         How to find suppliers of support for GCC.
 * Contributing::    How to contribute to testing and developing GCC.
@@ -287,8 +286,6 @@ bugs.  It corresponds to GCC version 3.1.
 
 @include invoke.texi
 
-@include install-old.texi
-
 @include extend.texi
 
 @include objc.texi
diff --git a/gcc/doc/include/fdl.texi b/gcc/doc/include/fdl.texi
index 88cf36762c8..1f3d8b6521d 100644
--- a/gcc/doc/include/fdl.texi
+++ b/gcc/doc/include/fdl.texi
@@ -17,7 +17,7 @@ of this license document, but changing it is not allowed.
 @ifset gfdlhtml
 @ifnothtml
 @comment node-name,     next,          previous, up
-@node    GNU Free Documentation License, Concept Index, Specific, Top
+@node    GNU Free Documentation License, Concept Index, Old, Top
 @end ifnothtml
 @html
 <h1 align="center">Installing GCC: GNU Free Documentation License</h1>
diff --git a/gcc/doc/install-old.texi b/gcc/doc/install-old.texi
index 4bb526aa151..9ce98968f91 100644
--- a/gcc/doc/install-old.texi
+++ b/gcc/doc/install-old.texi
@@ -1,20 +1,30 @@
 @c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 @c This is part of the GCC manual.
-@c For copying conditions, see the file gcc.texi.
-
-@node Installation
-@chapter Installing GNU CC
-@cindex installing GNU CC
+@c For copying conditions, see the file install.texi.
+
+@ifnothtml
+@comment node-name,     next,          previous, up
+@node    Old, GNU Free Documentation License, Specific, Top
+@end ifnothtml
+@html
+<h1 align="center">Old installation documentation</h1>
+@end html
+@ifnothtml
+@chapter Old installation documentation
+@end ifnothtml
 
 Note most of this information is out of date and superseded by the
-new GCC install manual @file{gcc/doc/install.texi}.  It is
-provided for historical reference only.
+previous chapters of this manual.  It is provided for historical
+reference only, because of a lack of volunteers to merge it into the
+main manual.
 
+@ifnothtml
 @menu
 * Configurations::    Configurations Supported by GNU CC.
 * Cross-Compiler::   Building and installing a cross-compiler.
 * VMS Install::   See below for installation on VMS.
 @end menu
+@end ifnothtml
 
 Here is the procedure for installing GNU CC on a GNU or Unix system.
 See @ref{VMS Install}, for VMS systems.
@@ -83,8 +93,13 @@ section before proceeding any further with the installation of GNU CC@.
 
 @end enumerate
 
-@node Configurations
+@ifnothtml
+@node Configurations, Cross-Compiler, , Old
 @section Configurations Supported by GNU CC
+@end ifnothtml
+@html
+<h2>@anchor{Configurations}Configurations Supported by GNU CC</h2>
+@end html
 @cindex configurations supported by GNU CC
 
 Here are the possible CPU types:
@@ -192,8 +207,13 @@ things you must know:
 See @ref{VMS Install}, for details on how to install GNU CC on VMS@.
 @end table
 
-@node Cross-Compiler
+@ifnothtml
+@node Cross-Compiler, VMS Install, Configurations, Old
 @section Building and Installing a Cross-Compiler
+@end ifnothtml
+@html
+<h2>@anchor{Cross-Compiler}Building and Installing a Cross-Compiler</h2>
+@end html
 @cindex cross-compiler, installation
 
 GNU CC can function as a cross-compiler for many machines, but not all.
@@ -223,6 +243,7 @@ If you want to link on other than the target machine, you need a
 cross-linker as well.  You also need header files and libraries suitable
 for the target machine that you can install on the host machine.
 
+@ifnothtml
 @menu
 * Steps of Cross::      Using a cross-compiler involves several steps
                           that may be carried out on different machines.
@@ -232,9 +253,15 @@ for the target machine that you can install on the host machine.
                           for a cross-compiler.
 * Build Cross::         Actually compiling the cross-compiler.
 @end menu
+@end ifnothtml
 
-@node Steps of Cross
+@ifnothtml
+@node Steps of Cross, Configure Cross, , Cross-Compiler
 @subsection Steps of Cross-Compilation
+@end ifnothtml
+@html
+<h2>Steps of Cross-Compilation</h2>
+@end html
 
 To compile and run a program using a cross-compiler involves several
 steps:
@@ -262,8 +289,13 @@ since then you can do it all with a single invocation of GNU CC@.  This
 requires a suitable cross-assembler and cross-linker.  For some targets,
 the GNU assembler and linker are available.
 
-@node Configure Cross
+@ifnothtml
+@node Configure Cross, Tools and Libraries, Steps of Cross, Cross-Compiler
 @subsection Configuring a Cross-Compiler
+@end ifnothtml
+@html
+<h2>Configuring a Cross-Compiler</h2>
+@end html
 
 To build GNU CC as a cross-compiler, you start out by running
 @file{configure}.  Use the @option{--target=@var{target}} to specify the
@@ -277,8 +309,13 @@ produces code for an HP 68030 system running BSD on a system that
 ./configure --target=m68k-hp-bsd4.3
 @end smallexample
 
-@node Tools and Libraries
+@ifnothtml
+@node Tools and Libraries, Cross Headers, Configure Cross, Cross-Compiler
 @subsection Tools and Libraries for a Cross-Compiler
+@end ifnothtml
+@html
+<h2>Tools and Libraries for a Cross-Compiler</h2>
+@end html
 
 If you have a cross-assembler and cross-linker available, you should
 install them now.  Put them in the directory
@@ -353,8 +390,13 @@ mget *crt*.o
 quit
 @end example
 
-@node Cross Headers
+@ifnothtml
+@node Cross Headers, Build Cross, Tools and Libraries, Cross-Compiler
 @subsection Cross-Compilers and Header Files
+@end ifnothtml
+@html
+<h2>Cross-Compilers and Header Files</h2>
+@end html
 
 If you are cross-compiling a standalone program or a program for an
 embedded system, then you may not need any header files except the few
@@ -405,8 +447,13 @@ quit
 tar xf tarfile
 @end example
 
-@node Build Cross
+@ifnothtml
+@node Build Cross, , Cross Headers, Cross-Compiler
 @subsection Actually Building the Cross-Compiler
+@end ifnothtml
+@html
+<h2>Actually Building the Cross-Compiler</h2>
+@end html
 
 Now you can proceed just as for compiling a single-machine compiler
 through the step of building stage 1.
@@ -433,8 +480,13 @@ must specify a 68030 as the host when you configure it.
 
 To install the cross-compiler, use @samp{make install}, as usual.
 
-@node VMS Install
+@ifnothtml
+@node VMS Install, , Cross-Compiler, Old
 @section Installing GNU CC on VMS
+@end ifnothtml
+@html
+<h2>@anchor{VMS Install}Installing GNU CC on VMS</h2>
+@end html
 @cindex VMS installation
 @cindex installing GNU CC on VMS
 
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index c2e60eb99f7..5c190e86e24 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -32,6 +32,9 @@
 @ifset binarieshtml
 @settitle Installing GCC: Binaries
 @end ifset
+@ifset oldhtml
+@settitle Installing GCC: Old documentation
+@end ifset
 @ifset gfdlhtml
 @settitle Installing GCC: GNU Free Documentation License
 @end ifset
@@ -50,6 +53,7 @@
 @set testhtml
 @set finalinstallhtml
 @set binarieshtml
+@set oldhtml
 @set gfdlhtml
 @end ifnothtml
 
@@ -105,6 +109,8 @@ Free Documentation License}''.
 * Specific::        Host/target specific installation notes for GCC.
 * Binaries::        Where to get pre-compiled binaries.
 
+* Old::             Old installation documentation.
+
 * GNU Free Documentation License:: How you can copy and share this manual.
 * Concept Index::   This index has two entries.
 @end menu
@@ -184,6 +190,12 @@ remove that directory when you do not need that specific version of GCC
 any longer, and, if shared libraries are installed there as well, no
 more binaries exist that use them.
 
+@ifhtml
+There are also some @uref{old.html,,old installation instructions},
+which are mostly obsolete but still contain some information which has
+not yet been merged into the main part of this manual.
+@end ifhtml
+
 @html
 <hr>
 <p>
@@ -1389,7 +1401,7 @@ works.
 @c ***Specific****************************************************************
 @ifnothtml
 @comment node-name,     next,          previous, up
-@node    Specific, GNU Free Documentation License, Binaries, Top
+@node    Specific, Old, Binaries, Top
 @end ifnothtml
 @ifset specifichtml
 @html
@@ -3685,6 +3697,19 @@ automatically.
 @end ifhtml
 @end ifset
 
+@c ***Old documentation******************************************************
+@ifset oldhtml
+@include install-old.texi
+@html
+</p>
+<hr>
+<p>
+@end html
+@ifhtml
+@uref{./index.html,,Return to the GCC Installation page}
+@end ifhtml
+@end ifset
+
 @c ***GFDL********************************************************************
 @ifset gfdlhtml
 @include fdl.texi
diff --git a/gcc/doc/install.texi2html b/gcc/doc/install.texi2html
index 946a45a0b53..7494a1cb9a1 100755
--- a/gcc/doc/install.texi2html
+++ b/gcc/doc/install.texi2html
@@ -22,7 +22,8 @@ if [ ! -d $DESTDIR ]; then
 fi
 
 for x in index.html specific.html download.html configure.html \
-         build.html test.html finalinstall.html binaries.html gfdl.html
+         build.html test.html finalinstall.html binaries.html old.html \
+         gfdl.html
 do
     define=`echo $x | sed -e 's/\.//g'`
     echo "define = $define"