[patch] Re: [patch, docs] Standardize GCC manual title pages.

Brooks Moses <[email protected]> Tue, 27 Feb 2007 02:25:18 -0800
Newsgroups gmane.comp.gcc.patches,gmane.comp.gcc.fortran,gmane.comp.gcc.gnat
Message-ID <[email protected]>
This is a multi-part message in MIME format.
--------------080405000806040001060006
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Andreas Schwab wrote:
> Brooks Moses <[email protected]> writes:
>> Committed to trunk, and to 4.2 after testing on i686-pc-linux-gnu.
> 
> I'm getting this on the 4.2 branch:
> 
> (echo "@set version-GCC 4.2.0"; \
>  if [ "prerelease" = "experimental" ]; \
>  then echo "@set DEVELOPMENT"; \
>  else echo "@clear DEVELOPMENT"; \
>  fi) > gcc-vers.texiT
> echo "@set srcdir ../../gcc" >> gcc-vers.texiT
> if [ xinfo = xinfo ]; then \
>         makeinfo --split-size=5000000 --split-size=5000000 --split-size=5000000 --no-split -I ../../gcc/doc \
>                 -I ../../gcc/doc/include -o doc/gccinstall.info ../../gcc/doc/install.texi; \
> fi
> mv -f gcc-vers.texiT gcc-vers.texi
> ../../gcc/doc/include/gcc-common.texi:11: @include `gcc-vers.texi': No such file or directory.
> makeinfo: Removing output file `doc/gccinstall.info' due to errors; use --force to preserve.
> make[3]: *** [doc/gccinstall.info] Error 1

Bleah.  It works fine on my system, but apparently that's just luck -- I 
missed including the new gcc-vers.texi dependency in gccinstall.* in the 
Makefile, but on my system the "mv -f gcc-vers.texiT gcc-vers.texi" line 
happens to get executed first anyway.

The attached patch ought to fix it; I've tested it on i686-pc-linux-gnu 
(which unfortunately doesn't prove it fixes anything, because it worked 
before, but at least proves it didn't break things), and committed it to 
4.2 and trunk as obvious.  (svn 122365 and 122366)  Let me know if this 
doesn't fix things.

Apologies for the breakage.

- Brooks


-----------------------------------------------------------------------
2007-02-26  Brooks Moses  <[email protected]>

	* Makefile.in (TEXI_GCCINSTALL_FILES): Add gcc-vers.texi
	dependency.

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


--------------080405000806040001060006
Content-Type: text/x-patch;
 name="titlepagesmakefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="titlepagesmakefile.diff"

Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in	(revision 122357)
+++ gcc/Makefile.in	(working copy)
@@ -3530,7 +3530,8 @@
 	 sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi	\
 	 loop.texi
 
-TEXI_GCCINSTALL_FILES = install.texi install-old.texi fdl.texi
+TEXI_GCCINSTALL_FILES = install.texi install-old.texi fdl.texi		\
+	 gcc-vers.texi
 
 TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
 

--------------080405000806040001060006--