|
From: <sv...@va...> - 2005-07-25 21:12:43
|
Author: njn Date: 2005-07-25 22:12:40 +0100 (Mon, 25 Jul 2005) New Revision: 4255 Log: 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. Modified: trunk/docs/Makefile.am Modified: trunk/docs/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/Makefile.am 2005-07-25 17:58:48 UTC (rev 4254) +++ trunk/docs/Makefile.am 2005-07-25 21:12:40 UTC (rev 4255) @@ -42,30 +42,30 @@ # chunked html html-docs: @echo "Generating html files..." - export XML_CATALOG_FILES=3D$(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=3D$(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 =20 # pdf and postscript print-docs: @echo "Generating PDF file: $(printdir)/index.pdf (please be patient)..= ."; - export XML_CATALOG_FILES=3D$(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=3D$(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) =20 # If the docs have been built, install them. But don't worry if they ha= ve=20 # not -- developers do 'make install' not from a 'make dist'-ified distr= o all |