From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 25 Jul 2005 21:12:40 +0000 (+0000)
Subject: Make it more obvious if something fails when making HTML or PS/PDF docs.
X-Git-Tag: svn/VALGRIND_3_0_0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0aac31daca63af3a428b5d28264394e62b564da;p=thirdparty%2Fvalgrind.git

Make it more obvious if something fails when making HTML or PS/PDF docs.

Also put the output of all pfdxmltex runs in the logfile, not just the
last run's output.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4255
---

diff --git a/docs/Makefile.am b/docs/Makefile.am
index d984a38eac..0ff8fe5470 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -42,30 +42,30 @@ valid:
 # chunked html
 html-docs:
 	@echo "Generating html files..."
-	export XML_CATALOG_FILES=$(XML_CATALOG_FILES)
-	mkdir -p $(htmldir)
-	/bin/rm -fr $(htmldir)/
-	mkdir -p $(htmldir)/
-	mkdir -p $(htmldir)/images
-	cp $(libdir)/vg_basic.css $(htmldir)/
-	cp $(imgdir)/*.png $(htmldir)/images
+	export XML_CATALOG_FILES=$(XML_CATALOG_FILES) && \
+	mkdir -p $(htmldir) && \
+	/bin/rm -fr $(htmldir)/ && \
+	mkdir -p $(htmldir)/ && \
+	mkdir -p $(htmldir)/images && \
+	cp $(libdir)/vg_basic.css $(htmldir)/ && \
+	cp $(imgdir)/*.png $(htmldir)/images && \
 	$(XSLTPROC) $(XSLTPROC_FLAGS) -o $(htmldir)/ $(XSL_HTML_CHUNK_STYLE) $(xmldir)/index.xml
 
 # pdf and postscript
 print-docs:
 	@echo "Generating PDF file: $(printdir)/index.pdf (please be patient)...";
-	export XML_CATALOG_FILES=$(XML_CATALOG_FILES);
-	mkdir -p $(printdir);
-	mkdir -p $(printdir)/images;
-	cp $(imgdir)/massif-graph-sm.png $(printdir)/images;
-	$(XSLTPROC) $(XSLTPROC_FLAGS) -o $(printdir)/index.fo $(XSL_FO_STYLE) $(xmldir)/index.xml;
+	export XML_CATALOG_FILES=$(XML_CATALOG_FILES) && \
+	mkdir -p $(printdir) && \
+	mkdir -p $(printdir)/images && \
+	cp $(imgdir)/massif-graph-sm.png $(printdir)/images && \
+	$(XSLTPROC) $(XSLTPROC_FLAGS) -o $(printdir)/index.fo $(XSL_FO_STYLE) $(xmldir)/index.xml && \
 	(cd $(printdir) && \
-	 pdfxmltex index.fo &> $(LOGFILE) && \
-	 pdfxmltex index.fo &> $(LOGFILE) && \
-	 pdfxmltex index.fo &> $(LOGFILE) && \
+         ( pdfxmltex index.fo && \
+	   pdfxmltex index.fo && \
+	   pdfxmltex index.fo ) &> $(LOGFILE) && \
 	 echo "Generating PS file: $(printdir)/index.ps ..." && \
 	 pdftops index.pdf && \
-	 rm *.log *.aux *.fo *.out)
+	 rm -f *.log *.aux *.fo *.out)
 
 # If the docs have been built, install them.  But don't worry if they have 
 # not -- developers do 'make install' not from a 'make dist'-ified distro all