Re: 3.2 PATCH: New install.info and install.dvi targets

[Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>]

Joseph S. Myers writes:

> Info files need to be mentioned in .cvsignore.  Also, I think the name
> change to gccinstall.info (both in the name built in the Makefile, and in
> the @setfilename) should be done now in preparation for possible future
> installation of the manual.

Ok, here we go.  As I said, I've left the name of install.texi2html
unchanged.  I start with a patch to branching.html to reflect the new
name:

Index: branching.html
===================================================================
RCS file: /cvs/gcc/wwwdocs/htdocs/branching.html,v
retrieving revision 1.4
diff -u -p -r1.4 branching.html
--- branching.html	3 May 2002 15:38:05 -0000	1.4
+++ branching.html	3 May 2002 17:00:20 -0000
@@ -35,7 +35,7 @@ use the next major release number.  Also
 copies of <code>buildstat.html</code>, <code>changes.html</code>, and
 <code>criteria.html</code></li>
 
-<li>Update <code>doc/install.texi</code> to reference the newly created
+<li>Update <code>doc/gccinstall.texi</code> to reference the newly created
 <code>buildstat.html</code>.</li>
 
 <li>Update <code>f/root.texi</code> on the branch to use <code>@clear


Here's the revised body of the patch, updated to reflect the new name.
Since this patch doesn't affect the build procedure, I've tested this by
running make $(docdir)/gccinstall.info and make gccinstall.dvi in a freshly
configured build directory.

Ok for mainline now?

	Rainer



Fri May  3 01:18:01 2002  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* INSTALL/README: Reflect renaming install.texi to gccinstall.texi.
	* README: Likewise

	gcc:
	* doc/gccinstall.texi: Renamed from doc/install.texi.
	(@setfilename): Reflect this.
	* doc/install-old.texi: Likewise.
	* doc/sourcebuild.texi (Texinfo Manuals): Likewise.
	(Front End): Likewise.
	(Back End): Likewise.
	* doc/install.texi2html: Likewise.

	* Makefile.in ($(docdir)/gccinstall.info): New target.
	(info): Depend on it.
	* doc/.cvsignore: Ignore new info files.
	($(docdir)/gccinstall.dvi): New target.
	(dvi): Depend on it.

Index: README
===================================================================
RCS file: /cvs/gcc/gcc/README,v
retrieving revision 1.5
diff -u -p -r1.5 README
--- README	13 Jun 2001 18:48:09 -0000	1.5
+++ README	3 May 2002 16:55:35 -0000
@@ -7,7 +7,7 @@ for details.
 
 The directory INSTALL contains copies of the installation information
 as HTML and plain text.  The source of this information is
-gcc/doc/install.texi.  The installation information includes details
+gcc/doc/gccinstall.texi.  The installation information includes details
 of what is included in the GCC sources and what files GCC installs.
 
 See the file gcc/doc/gcc.texi (together with other files that it
Index: INSTALL/README
===================================================================
RCS file: /cvs/gcc/gcc/INSTALL/README,v
retrieving revision 1.7
diff -u -p -r1.7 README
--- INSTALL/README	13 Jun 2001 14:51:33 -0000	1.7
+++ INSTALL/README	3 May 2002 16:55:35 -0000
@@ -1,6 +1,6 @@
 This directory has been obsoleted for GCC snapshots and CVS access.
 
 For releases the installation documentation is generated from
-gcc/doc/install.texi and copied into this directory.
+gcc/doc/gccinstall.texi and copied into this directory.
 
 To read this documentation, please point your HTML browser to "index.html".
Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.863
diff -u -p -r1.863 Makefile.in
--- gcc/Makefile.in	29 Apr 2002 22:34:32 -0000	1.863
+++ gcc/Makefile.in	3 May 2002 16:55:36 -0000
@@ -2342,7 +2344,7 @@ stmp-fixproto: fixhdr.ready fixproto stm
 docdir = $(srcdir)/doc
 
 doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
-info: $(docdir)/cpp.info $(docdir)/gcc.info $(docdir)/gccint.info lang.info $(docdir)/cppinternals.info
+info: $(docdir)/cpp.info $(docdir)/gcc.info $(docdir)/gccint.info $(docdir)/install.info lang.info $(docdir)/cppinternals.info
 
 $(docdir)/cpp.info: $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
   $(docdir)/cppenv.texi $(docdir)/cppopts.texi
@@ -2373,11 +2375,16 @@ $(docdir)/gccint.info: $(docdir)/gccint.
 	 $(docdir)/languages.texi $(docdir)/sourcebuild.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccint.info doc/gccint.texi
 
+$(docdir)/gccinstall.info: $(docdir)/gccinstall.texi \
+   $(docdir)/install-old.texi \
+   $(docdir)/include/fdl.texi
+	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccinstall.info doc/gccinstall.texi
+
 $(docdir)/cppinternals.info: $(docdir)/cppinternals.texi
 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cppinternals.info \
 		doc/cppinternals.texi
 
-dvi: gcc.dvi gccint.dvi cpp.dvi lang.dvi cppinternals.dvi
+dvi: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi lang.dvi cppinternals.dvi
 
 # This works with GNU Make's default rule.
 cpp.dvi: $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
@@ -2409,6 +2416,10 @@ gccint.dvi: $(docdir)/gccint.texi \
 	 $(docdir)/languages.texi $(docdir)/sourcebuild.texi
 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/gccint.texi
 
+gccinstall.dvi: $(docdir)/gccinstall.texi $(docdir)/install-old.texi \
+	 $(docdir)/include/fdl.texi
+	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/gccinstall.texi
+
 cppinternals.dvi: $(docdir)/cppinternals.texi
 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cppinternals.texi
 
Index: gcc/doc/.cvsignore
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doc/.cvsignore,v
retrieving revision 1.4
diff -u -p -r1.4 .cvsignore
--- gcc/doc/.cvsignore	17 Dec 2001 19:19:57 -0000	1.4
+++ gcc/doc/.cvsignore	3 May 2002 16:55:42 -0000
@@ -1,5 +1,6 @@
 gcc.info*
 gccint.info*
+gccinstall.info*
 cpp.info*
 cppinternals.info*
 gcc.1
Index: gcc/doc/install-old.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doc/install-old.texi,v
retrieving revision 1.13
diff -u -p -r1.13 install-old.texi
--- gcc/doc/install-old.texi	7 Dec 2001 16:57:27 -0000	1.13
+++ gcc/doc/install-old.texi	3 May 2002 16:55:46 -0000
@@ -1,6 +1,6 @@
-@c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+@c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 @c This is part of the GCC manual.
-@c For copying conditions, see the file install.texi.
+@c For copying conditions, see the file gccinstall.texi.
 
 @ifnothtml
 @comment node-name,     next,          previous, up
Index: gcc/doc/install.texi2html
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doc/install.texi2html,v
retrieving revision 1.7
diff -u -p -r1.7 install.texi2html
--- gcc/doc/install.texi2html	17 Dec 2001 19:42:57 -0000	1.7
+++ gcc/doc/install.texi2html	3 May 2002 16:55:46 -0000
@@ -27,5 +27,5 @@ for x in index.html specific.html downlo
 do
     define=`echo $x | sed -e 's/\.//g'`
     echo "define = $define"
-    $MAKEINFO -I $SOURCEDIR -I $SOURCEDIR/include $SOURCEDIR/install.texi --html --no-split -D$define -o$DESTDIR/$x
+    $MAKEINFO -I $SOURCEDIR -I $SOURCEDIR/include $SOURCEDIR/gccinstall.texi --html --no-split -D$define -o$DESTDIR/$x
 done
Index: gcc/doc/sourcebuild.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/doc/sourcebuild.texi,v
retrieving revision 1.5
diff -u -p -r1.5 sourcebuild.texi
--- gcc/doc/sourcebuild.texi	15 Apr 2002 20:19:15 -0000	1.5
+++ gcc/doc/sourcebuild.texi	3 May 2002 16:55:46 -0000
@@ -334,7 +334,7 @@ and @command{dvips}.  All Texinfo files 
 be checked into CVS, even if they are generated files, for the
 generation of online manuals to work.
 
-The installation manual, @file{doc/install.texi}, is also provided on
+The installation manual, @file{doc/gccinstall.texi}, is also provided on
 the GCC web site.  The HTML version is generated by the script
 @file{doc/install.texi2html}.
 
@@ -429,7 +429,7 @@ files for that front end.  @xref{Front E
 @file{@var{language}} Directory}, for details.
 @item
 A mention of the language in the list of supported languages in
-@file{gcc/doc/install.texi}.
+@file{gcc/doc/gccinstall.texi}.
 @item
 Details of contributors to that front end in
 @file{gcc/doc/contrib.texi}.  If the details are in that front end's
@@ -699,7 +699,7 @@ Particular Machines}).
 A note in @file{gcc/doc/contrib.texi} under the person or people who
 contributed the target support.
 @item
-Entries in @file{gcc/doc/install.texi} for all target triplets
+Entries in @file{gcc/doc/gccinstall.texi} for all target triplets
 supported with this target architecture, giving details of any special
 notes about installation for this target, or saying that there are no
 special notes if there are none.