Makefile.am (stamp-pdf-doxygen): Grep for LaTeX errors in log.

	* doc/Makefile.am (stamp-pdf-doxygen): Grep for LaTeX errors in log.
	* doc/Makefile.in: Regenerate.

From-SVN: r225191

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e2d1f51f374401cdb94296d8e81ad825c5cd4789..f159f786b7d553c81a81a3f5876d5f72e10ba260 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2015-06-30  Jonathan Wakely  <jwakely@redhat.com>
 
+       * doc/Makefile.am (stamp-pdf-doxygen): Grep for LaTeX errors in log.
+       * doc/Makefile.in: Regenerate.
+
        * include/bits/stl_pair.h: Replace class keyword with typename.
 
 2015-06-30  Ville Voutilainen  <ville.voutilainen@gmail.com>

diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am
index d6ea2d1648dcc9cf1444440eca4fcacec84af0f5..d63cf17db8e071ac527d297267659625031f0ee0 100644 (file)
--- a/libstdc++-v3/doc/Makefile.am
+++ b/libstdc++-v3/doc/Makefile.am
@@ -257,6 +257,7 @@ stamp-latex-doxygen: ${doxygen_outdir}/latex
 # include asking a wizard to enlarge capacity. If this is the case,
 # find texmf.cnf and add a zero for pool_size, string_vacancies,
 # max_strings, and pool_free values.
+# Errors like "File `foo.sty' not found" mean a TeX package is missing.
 stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
        -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
        echo "Generating doxygen pdf file...";
@@ -265,6 +266,7 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
          echo ":: PDF file is ${api_pdf}"; \
        else \
          echo "... error"; \
+         grep -F 'LaTeX Error' ${doxygen_outdir}/latex/refman.log; \
          exit 12; \
        fi
        $(STAMP) stamp-pdf-doxygen

diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index 4690fad8ac60fac87c41c998049f979ec51fe9d3..798a9a3ae3781b3a687cd1c06366ac5f8140bbda 100644 (file)
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -891,6 +891,7 @@ stamp-latex-doxygen: ${doxygen_outdir}/latex
 # include asking a wizard to enlarge capacity. If this is the case,
 # find texmf.cnf and add a zero for pool_size, string_vacancies,
 # max_strings, and pool_free values.
+# Errors like "File `foo.sty' not found" mean a TeX package is missing.
 stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
        -(cd ${doxygen_outdir}/latex && $(MAKE) -i pdf;)
        echo "Generating doxygen pdf file...";
@@ -899,6 +900,7 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf
          echo ":: PDF file is ${api_pdf}"; \
        else \
          echo "... error"; \
+         grep -F 'LaTeX Error' ${doxygen_outdir}/latex/refman.log; \
          exit 12; \
        fi
        $(STAMP) stamp-pdf-doxygen