From 201f1cce71bf59f8b36a73070eda02ced8db3d7e Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Sun, 22 Feb 2015 19:17:08 +0000 Subject: [PATCH] Makefile: postprocess texinfo files to update @dircategory and update texi files under... * doc/Makefile: postprocess texinfo files to update @dircategory and update texi files under gcc/ada. * gnat_ugn.texi, gnat_rm.texi: Regenerated. From-SVN: r220898 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/doc/Makefile | 1 + gcc/ada/gnat_rm.texi | 6 +++--- gcc/ada/gnat_ugn.texi | 8 ++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bb4d68db704..ddd6e100c28 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2015-02-22 Arnaud Charlet + + * doc/Makefile: postprocess texinfo files to update @dircategory + and update texi files under gcc/ada. + * gnat_ugn.texi, gnat_rm.texi: Regenerated. + 2015-02-22 Arnaud Charlet * doc/gnat_ugn/project-manager-figure.png, diff --git a/gcc/ada/doc/Makefile b/gcc/ada/doc/Makefile index 9a8070ce612..9ac33c50b6a 100644 --- a/gcc/ada/doc/Makefile +++ b/gcc/ada/doc/Makefile @@ -63,6 +63,7 @@ clean: %.texinfo: $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/$*/texinfo + sed -e 's/^@dircategory/@dircategory GNU Ada Tools/g' < $(BUILDDIR)/$*/texinfo/$*.texi > $(BUILDDIR)/../../$*.texi html-all: $(foreach doc, $(DOC_LIST), $(doc).html) diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index bcf9b3c69b8..1985fd73d1b 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -3,14 +3,14 @@ @setfilename gnat_rm.info @documentencoding UTF-8 @ifinfo -@*Generated by Sphinx 1.2.2.@* +@*Generated by Sphinx 1.3b2.@* @end ifinfo @settitle GNAT Reference Manual @defindex ge @paragraphindent 0 @exampleindent 4 @finalout -@dircategory +@dircategory GNU Ada Tools @direntry * gnat_rm: (gnat_rm.info). gnat_rm @end direntry @@ -21,7 +21,7 @@ @copying @quotation -GNAT Reference Manual , February 20, 2015 +GNAT Reference Manual , February 22, 2015 AdaCore diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 87becc74819..49740e7a470 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -3,14 +3,14 @@ @setfilename gnat_ugn.info @documentencoding UTF-8 @ifinfo -@*Generated by Sphinx 1.2.2.@* +@*Generated by Sphinx 1.3b2.@* @end ifinfo @settitle GNAT User's Guide for Native Platforms @defindex ge @paragraphindent 0 @exampleindent 4 @finalout -@dircategory +@dircategory GNU Ada Tools @direntry * gnat_ugn: (gnat_ugn.info). gnat_ugn @end direntry @@ -21,7 +21,7 @@ @copying @quotation -GNAT User's Guide for Native Platforms , February 20, 2015 +GNAT User's Guide for Native Platforms , February 22, 2015 AdaCore @@ -5976,7 +5976,7 @@ or AIX), the simple approach described above will not work and a pre-linking phase using GNAT will be necessary. @end itemize -Another alternative is to use the @strong{gprbuild} multi-language builder +Another alternative is to use the @code{gprbuild} multi-language builder which has a large knowledge base and knows how to link Ada and C++ code together automatically in most cases. -- 2.30.2