install.texi: Use the GFDL.

	* doc/install.texi: Use the GFDL.  Include years from old install
	manual in copyright notice.  Include copyright and GFDL notice on
	HTML index page.  Include usual footer on testing.html.
	* doc/install.texi2html: Build gfdl.html.  Use -I
	$SOURCEDIR/include.
	* doc/include/fdl.texi: Adapt for use in the install manual.

From-SVN: r47598

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f2ce97e480d2e56c7c4ba8ad9977cf26a79ed28..210365b674cf0c6593e0919e8b3bd965167735e9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-18  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * doc/install.texi: Use the GFDL.  Include years from old install
+       manual in copyright notice.  Include copyright and GFDL notice on
+       HTML index page.  Include usual footer on testing.html.
+       * doc/install.texi2html: Build gfdl.html.  Use -I
+       $SOURCEDIR/include.
+       * doc/include/fdl.texi: Adapt for use in the install manual.
+
 2001-12-04  Joseph S. Myers  <jsm28@cam.ac.uk>
 
        * doc/install.texi: Document that installed native compiler for

diff --git a/gcc/doc/include/fdl.texi b/gcc/doc/include/fdl.texi
index b24818bab896279b86b33b57e28721134ba2e910..88cf36762c8ca685b70945ae072aecc51c6d5079 100644 (file)
--- a/gcc/doc/include/fdl.texi
+++ b/gcc/doc/include/fdl.texi
@@ -13,9 +13,24 @@ Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 @c man end
 @end ignore
-@node GNU Free Documentation License
+@c Special handling for inclusion in the install manual.
+@ifset gfdlhtml
+@ifnothtml
+@comment node-name,     next,          previous, up
+@node    GNU Free Documentation License, Concept Index, Specific, Top
+@end ifnothtml
+@html
+<h1 align="center">Installing GCC: GNU Free Documentation License</h1>
+@end html
+@ifnothtml
+@unnumbered GNU Free Documentation License
+@end ifnothtml
+@end ifset
 @c man begin DESCRIPTION
+@ifclear gfdlhtml
+@node GNU Free Documentation License
 @unnumbered GNU Free Documentation License
+@end ifclear
 
 @cindex FDL, GNU Free Documentation License
 @center Version 1.1, March 2000

diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 3206881f913f7edb90bdb94d58147a63e30c5f1a..c2e60eb99f7cd7eb3986937f20ac12b4727c43ae 100644 (file)
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -32,8 +32,12 @@
 @ifset binarieshtml
 @settitle Installing GCC: Binaries
 @end ifset
+@ifset gfdlhtml
+@settitle Installing GCC: GNU Free Documentation License
+@end ifset
 
-@c Copyright (C) 2001 Free Software Foundation, Inc.
+@c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+@c 1999, 2000, 2001 Free Software Foundation, Inc.
 @c *** Converted to texinfo by Dean Wakerley, dean@wakerley.com
 
 @c Include everything if we're not making html
@@ -46,12 +50,34 @@
 @set testhtml
 @set finalinstallhtml
 @set binarieshtml
+@set gfdlhtml
 @end ifnothtml
 
 @c Part 2 Summary Description and Copyright
+@macro copyrightnotice
+Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+1999, 2000, 2001 Free Software Foundation, Inc.
+@sp 1
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, the Front-Cover texts being (a) (see below), and
+with the Back-Cover Texts being (b) (see below).  A copy of the
+license is included in the section entitled ``@uref{./gfdl.html,,GNU
+Free Documentation License}''.
+
+(a) The FSF's Front-Cover Text is:
+
+     A GNU Manual
+
+(b) The FSF's Back-Cover Text is:
+
+     You have freedom to copy and modify this GNU Manual, like GNU
+     software.  Copies published by the Free Software Foundation raise
+     funds for GNU development.
+@end macro
 @ifinfo
-
-Copyright @copyright{} 2001 Free Software Foundation, Inc.
+@copyrightnotice{}
 @end ifinfo
 
 @c Part 3 Titlepage and Copyright
@@ -63,7 +89,7 @@ Copyright @copyright{} 2001 Free Software Foundation, Inc.
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 2001 Free Software Foundation, Inc.
+@copyrightnotice{}
 @end titlepage
 
 @c Part 4 Top node and Master Menu
@@ -79,6 +105,7 @@ Copyright @copyright{} 2001 Free Software Foundation, Inc.
 * Specific::        Host/target specific installation notes for GCC.
 * Binaries::        Where to get pre-compiled binaries.
 
+* GNU Free Documentation License:: How you can copy and share this manual.
 * Concept Index::   This index has two entries.
 @end menu
 @end ifinfo
@@ -163,6 +190,8 @@ more binaries exist that use them.
 @end html
 @ifhtml
 @uref{./index.html,,Return to the GCC Installation page}
+
+@copyrightnotice{}
 @end ifhtml
 @end ifset
 
@@ -1173,6 +1202,13 @@ behave on different platforms and compare them with your results.  A
 few failing testcases are possible even on released versions and you
 should look here first if you think your results are unreasonable.
 
+@html
+<hr>
+<p>
+@end html
+@ifhtml
+@uref{./index.html,,Return to the GCC Installation page}
+@end ifhtml
 @end ifset
 
 @c ***Final install***********************************************************
@@ -1353,7 +1389,7 @@ works.
 @c ***Specific****************************************************************
 @ifnothtml
 @comment node-name,     next,          previous, up
-@node    Specific, Concept Index, Binaries, Top
+@node    Specific, GNU Free Documentation License, Binaries, Top
 @end ifnothtml
 @ifset specifichtml
 @html
@@ -3649,11 +3685,24 @@ automatically.
 @end ifhtml
 @end ifset
 
+@c ***GFDL********************************************************************
+@ifset gfdlhtml
+@include fdl.texi
+@html
+</p>
+<hr>
+<p>
+@end html
+@ifhtml
+@uref{./index.html,,Return to the GCC Installation page}
+@end ifhtml
+@end ifset
+
 @c ***************************************************************************
 @c Part 6 The End of the Document
 @ifinfo
 @comment node-name,     next,          previous, up
-@node    Concept Index, , Specific, Top
+@node    Concept Index, , GNU Free Documentation License, Top
 @end ifinfo
 
 @ifinfo

diff --git a/gcc/doc/install.texi2html b/gcc/doc/install.texi2html
index fbfba0b2b964a67adc1a99b81986f2ca83b599da..946a45a0b53223abd884ceb31055270e90214c9f 100755 (executable)
--- a/gcc/doc/install.texi2html
+++ b/gcc/doc/install.texi2html
@@ -22,9 +22,9 @@ if [ ! -d $DESTDIR ]; then
 fi
 
 for x in index.html specific.html download.html configure.html \
-         build.html test.html finalinstall.html binaries.html
+         build.html test.html finalinstall.html binaries.html gfdl.html
 do
     define=`echo $x | sed -e 's/\.//g'`
     echo "define = $define"
-    $MAKEINFO $SOURCEDIR/install.texi --html --no-split -D$define -o$DESTDIR/$x
+    $MAKEINFO -I $SOURCEDIR/include $SOURCEDIR/install.texi --html --no-split -D$define -o$DESTDIR/$x
 done