Makefile: postprocess texinfo files to update @dircategory and update texi files...

	* 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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bb4d68db704bc2b9b1e3a9b5961068f790a7ef46..ddd6e100c289f49f7d064ec86d37e28c1d6b8897 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-22  Arnaud Charlet  <charlet@adacore.com>
+
+       * 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  <charlet@adacore.com>
 
        * doc/gnat_ugn/project-manager-figure.png,

diff --git a/gcc/ada/doc/Makefile b/gcc/ada/doc/Makefile
index 9a8070ce612a5120b9f44ce8c5f8be2acd652b1d..9ac33c50b6a54a43353c4f62134e8e1f462c592e 100644 (file)
--- 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 bcf9b3c69b846766b5a93e5d2eb65f03157550dd..1985fd73d1be6d91b6e26f35cfcbfbe9bfc6f644 100644 (file)
--- 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 87becc748191c7ed2d82d6524f8ffa61bbe8889f..49740e7a470c555d10290a86faad22c1989b8421 100644 (file)
--- 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.