From beda6ff583488acac64cbf47fad309370d6e2497 Mon Sep 17 00:00:00 2001 From: Philippe Chauvat Date: Thu, 11 Oct 2012 12:23:58 +0200 Subject: [PATCH] console should be ok make tex and make pdflatex --- docs/covers/svg/coverpage-developers.svg | 496 +++++++++++++++++++++++ docs/manuals/en/console/Makefile.in | 51 ++- 2 files changed, 527 insertions(+), 20 deletions(-) create mode 100644 docs/covers/svg/coverpage-developers.svg diff --git a/docs/covers/svg/coverpage-developers.svg b/docs/covers/svg/coverpage-developers.svg new file mode 100644 index 00000000..0cd40844 --- /dev/null +++ b/docs/covers/svg/coverpage-developers.svg @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + User's Manual + Vol. 1 + Bacula Enterprise version 6 + + + Bacula Enterprise + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Developers Guide + + diff --git a/docs/manuals/en/console/Makefile.in b/docs/manuals/en/console/Makefile.in index 4befbda5..12eb1e5b 100644 --- a/docs/manuals/en/console/Makefile.in +++ b/docs/manuals/en/console/Makefile.in @@ -38,16 +38,25 @@ IMAGES=../../../images DOC=console MAINDOC=Bacula_Console_Operators_Gu.html + +MANUALSDIR=../.. BSYSMANUALDIR=../../../bsysmanual -COVERSDIR=../../../covers/pdf -LICENSESDIR=../../licences -COVERNAME=console-coverpage +COVERSDIR=../../../covers +PDFCOVERSDIR=$(COVERSDIR)/pdf +SVGCOVERSDIR=$(COVERSDIR)/svg +EPSCOVERSDIR=$(COVERSDIR)/eps +LICENSESDIR=$(MANUALSDIR)/licences +COVERNAME=coverpage-console BSYSMANNAME=bsysmanual-coverpagebackground LICENCES=$(wildcard $(LICENSESDIR)/*.tex) +BSYSCOMPILERFILE=bsys-compiler-mode.tex +PDFCOMPILERFILE=$(MANUALSDIR)/bsys-pdflatex-mode.tex +TEXCOMPILERFILE=$(MANUALSDIR)/bsys-latex-mode.tex +WEBCOMPILERFILE=$(MANUALSDIR)/bsys-web-mode.tex first_rule: all -all: tex web dvipdf mini-clean +all: pdflatex tex web mini-clean .SUFFIXES: .tex .html .PHONY: @@ -55,7 +64,8 @@ all: tex web dvipdf mini-clean pdfcovers: @echo -n "Linking coverpage and background PDF format..." - @ln -sf `pwd`/${COVERSDIR}/${COVERNAME}.pdf `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf + @(cd $(SVGCOVERSDIR) ; make pdf) + @ln -sf `pwd`/${PDFCOVERSDIR}/${COVERNAME}.pdf `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf @echo "Done." pdfimages: @@ -71,29 +81,29 @@ pngimages: epsimages: @echo "Generating EPS images..." @(cd ${IMAGES}/svg ; make eps) + @rm -rf ${IMAGES}/png + @rm -rf ${IMAGES}/pdf @echo "Done." epscovers: - echo -n "Linking coverpage and background EPS format..." - (if [ ! -e ${COVERSDIR}/${COVERNAME}.eps ]; then \ - cd ${COVERSDIR} ; \ - pdf2ps ${COVERNAME}.pdf; \ - ps2eps ${COVERNAME}.ps; \ - rm ${COVERNAME}.ps; \ - fi) - ln -sf `pwd`/${COVERSDIR}/${COVERNAME}.eps `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.eps - rm `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf - echo "Done." + @echo -n "Linking coverpage and background EPS format..." + @(cd $(SVGCOVERSDIR) ; make eps) + @ln -sf `pwd`/${EPSCOVERSDIR}/${COVERNAME}.eps `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.eps + @rm -f `pwd`/${BSYSMANUALDIR}/${BSYSMANNAME}.pdf + @echo "Done." commonfiles: @echo -n "Linking shared files..." @(for L in $(LICENCES); do ln -sf $$L .; done) @echo "Done" -tex: pdfcovers epscovers epsimages commonfiles +tex: epscovers epsimages commonfiles @../../update_version @echo "Making version `cat version.tex`" - @cp -fp ${IMAGES}/hires/*.eps . + @rm -rf $(IMAGES)/pdf + @rm -rf $(IMAGES)/png +# @cp -fp ${IMAGES}/hires/*.eps . + @ln -sf $(TEXCOMPILERFILE) $(BSYSCOMPILERFILE) @touch ${DOC}i-dir.tex ${DOC}i-fd.tex ${DOC}i-sd.tex \ ${DOC}i-console.tex ${DOC}i-general.tex latex -interaction=batchmode ${DOC}.tex @@ -106,7 +116,7 @@ pdf: dvipdfm -p a4 ${DOC}.dvi pdflatex: pdfcovers pdfimages commonfiles - @echo "Making pdflatex" + @ln -sf $(PDFCOMPILERFILE) $(BSYSCOMPILERFILE) pdflatex -interaction=batchmode ${DOC}.tex makeindex ${DOC}.idx -o ${DOC}.ind 2>/dev/null pdflatex -interaction=batchmode ${DOC}.tex @@ -120,8 +130,9 @@ dvipdf: html: @echo " " @echo "Making html" - @cp -fp ${IMAGES}/*.eps . - @rm -f next.eps next.png prev.eps prev.png up.eps up.png + @ln -sf $(WEBCOMPILERFILE) $(BSYSCOMPILERFILE) +# @cp -fp ${IMAGES}/*.eps . +# @rm -f next.eps next.png prev.eps prev.png up.eps up.png @(if [ -f imagename_translations ] ; then \ ./translate_images.pl --from_meaningful_names ${DOC}.html; \ fi) -- 2.39.5