[cig-commits] [commit] master: fix Makefile for manual.pdf (266f1a8)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/aaed11c1898833c6583554baf897022609b23724...7fdc3c59c0e6bd28a26d46a1a11ed5e461266e84

>---------------------------------------------------------------

commit 266f1a830101991dc55aa5d5e75f060f60d12d5f
Author: Timo Heister <timo.heister at gmail.com>
Date:   Wed Sep 3 14:43:48 2014 -0400

    fix Makefile for manual.pdf
    
    It turns out the first pdflatex command will fail because of missing
    references. So ignore the return value.


>---------------------------------------------------------------

266f1a830101991dc55aa5d5e75f060f60d12d5f
 doc/Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index e01333d..c23b240 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -49,6 +49,11 @@ aspect.tag: $(aspect-files) options.dox Makefile
 	@echo 'GENERATE_TAGFILE = $@'                                >> aspect.dox
 	@doxygen aspect.dox || echo "Running doxygen to generate documentation failed."
 
+# make target for generating the pdf manual. The goal is to have the return
+# value of the sequence of bash commands reflect if building the manual was
+# successful. For this matter we need to catch errors from pdflatex, but we
+# need to ignore them the first time we run pdflatex, because of missing label
+# definitions, etc..
 manual.pdf: manual/manual.tex manual/manual.bib manual/parameters.tex \
             $(aspect-manual-pix) $(aspect-prms-out)
 	@if test -x "`which pdflatex`" \
@@ -56,12 +61,12 @@ manual.pdf: manual/manual.tex manual/manual.bib manual/parameters.tex \
                  -a -x "`which makeindex`" ; then \
 	   (cd manual ; \
 		rm -f manual.{aux,bbl,blg,log,out,pdf,toc} prm*.{idx,ilg,ind} ; \
-		pdflatex --interaction=batchmode manual.tex && \
-		bibtex manual       && \
-		makeindex prmindex  && \
-		pdflatex --interaction=batchmode manual.tex && \
-		pdflatex --interaction=batchmode manual.tex && \
-		pdflatex --interaction=batchmode manual.tex) && \
+		pdflatex --interaction=batchmode manual.tex;      \
+		bibtex manual                                  && \
+		makeindex prmindex                             && \
+		pdflatex --interaction=batchmode manual.tex    && \
+		pdflatex --interaction=batchmode manual.tex    && \
+		pdflatex --interaction=batchmode manual.tex)   && \
 	   mv manual/manual.pdf . || \
 	   (echo "Error compiling manual.pdf, check manual/manual.log" && false); \
          else \