From 621c730c0ea87d0a21f98ea5a70a8893bfca51d0 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 8 Jun 2005 08:35:18 +0000 Subject: [PATCH] Fix images -- FC3 netpdm bug --- docs/manual/Makefile | 73 ++++++++++++++------------------------- docs/manual/fileset.tex | 2 +- docs/manual/recycling.tex | 2 +- docs/manual/version.tex | 2 +- 4 files changed, 28 insertions(+), 51 deletions(-) diff --git a/docs/manual/Makefile b/docs/manual/Makefile index 6c27d4c6..c32cbdc9 100644 --- a/docs/manual/Makefile +++ b/docs/manual/Makefile @@ -4,11 +4,9 @@ # # To build everything do # make tex -# make links -# make all # make web # make html -# make pdf +# make dvipdf # # or simply # @@ -17,43 +15,10 @@ IMAGES=../images -# bacula -- special case below -# running -- special case below -# developers -- special case below - -# -# Note, these are all parts of the manual not in any -# particular order (mostly alphabetic). The order they -# appear in the manual is defined in bacula.tex -# -# Note also that certain of these chapters are in the -# bacula.tex manual, and others in the developers.tex -# manual. -# -MANUAL = \ - autochangers bootstrap bugs catalog \ - catmaintenance configure consoleconf console critical \ - daemonprotocol dirdconf director disk faq filedconf file \ - firewalls gpl install internaldb kaboom lesser \ - license messagesres monitorconf mysql oldfileset pools \ - porting postgresql progs projects quickstart recycling \ - regression rescuefloppy rescue restore rpm-faq \ - security spooling sqlite state storage \ - storedconf strategies stunnel \ - requirements supportedoses supporteddrives tapetesting \ - thanks tips vars verify win32 \ - daemonprotocol gui-interface \ - supportedchangers \ - md5 mediaformat mempool netprotocol porting smartall - - first_rule: bacula bacula: tex web html dvipdf -# Note, assume bacula manual was built first -# I've removed devhtml so that the resulting files -# (images) do not conflict with the main manual developers: devtex devweb devpdf .SUFFIXES: .tex .html @@ -95,6 +60,8 @@ dvipdf: @echo "Making dvi to pdf" @cp -fp ${IMAGES}/hires/*.eps . dvipdf bacula.dvi bacula.pdf +# Rename for loading on Web site + mv bacula.pdf dev-bacula.pdf @rm -f *.eps *.old @@ -111,14 +78,19 @@ devpdfm: @rm -f *.eps *.old html: + @echo " " @echo "Making html" -# If you turn on the following, it aborts after a "make clean" - @./translate_images.pl --from_meaningful_names bacula.html + @(if [ -e imagename_translations ] ; then \ + ./translate_images.pl --from_meaningful_names bacula.html; \ + fi) @cp -fp ${IMAGES}/*.eps . + @rm -f next.eps next.png prev.eps prev.png up.eps up.png latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \ - -init_file latex2html-init.pl bacula >/dev/null - @echo - @./translate_images.pl --to_meaningful_names bacula.html + -init_file latex2html-init.pl bacula >tex.out 2>&1 + @grep "unmatched" tex.out + @echo "opening brace #41 ... is expected" + @echo " " + ./translate_images.pl --to_meaningful_names bacula.html @rm -f *.eps *.gif *.jpg devhtml: @@ -129,24 +101,26 @@ devhtml: ./translate_images.pl developers.html @rm -f *.eps *.gif *.jpg *.old - web: @echo "Making web" @mkdir -p bacula - @cp -f imagename_translations bacula -# If you turn on the following, it aborts after a "make clean" - @./translate_images.pl --from_meaningful_names bacula/Bacula_Users_Guide.html + @cp -fp ${IMAGES}/*.eps *.txt ${IMAGES}/*.png bacula + @(if [ -e bacula/imagename_translations ] ; then \ + ./translate_images.pl --from_meaningful_names bacula/Bacula_Users_Guide.html; \ + fi) @rm -rf bacula/*.html @cp -fp ${IMAGES}/*.eps . @rm -f next.eps next.png prev.eps prev.png up.eps up.png @cp -fp ${IMAGES}/*.eps *.txt bacula @rm -f bacula/next.eps bacula/next.png bacula/prev.eps bacula/prev.png bacula/up.eps bacula/up.png latex2html -split 4 -local_icons -t "Bacula User's Guide" -long_titles 4 \ - -toc_stars -contents_in_nav -init_file latex2html-init.pl -white -notransparent bacula >/dev/null - @echo + -toc_stars -contents_in_nav -init_file latex2html-init.pl -white -notransparent bacula >tex.out 2>&1 + @grep "unmatched" tex.out + @echo "opening brace #41 ... is expected" @./translate_images.pl --to_meaningful_names bacula/Bacula_Users_Guide.html @cp -f bacula/Bacula_Freque_Asked_Questi.html bacula/faq.html @rm -f *.eps *.gif *.jpg bacula/*.eps *.old + @rm -f bacula/xp-*.png devweb: @echo "Making developers web" @@ -162,6 +136,9 @@ devweb: @cp -f developers/Developers_Guide.html developers/index.html @rm -f *.eps *.gif *.jpg developers/*.eps *.old +show: + xdvi bacula + texcheck: ./check_tex.pl bacula.tex ./check_tex.pl developers.tex @@ -175,7 +152,7 @@ clean: @rm -f *.pdf *.aux *.cp *.fn *.ky *.log *.pg @rm -f *.html *.backup *.pdf *.ps *.dvi *.ilg *.lof *.lot @rm -f *.cdx *.cnd *.ddx *.ddn *.fdx *.fnd *.ind *.sdx *.snd - @rm -f *.dnd + @rm -f *.dnd imagename_translations @rm -f *.old WARNINGS *.out *.toc *.idx @rm -f images.pl labels.pl internals.pl @rm -rf bacula developers diff --git a/docs/manual/fileset.tex b/docs/manual/fileset.tex index d8664549..3773c514 100644 --- a/docs/manual/fileset.tex +++ b/docs/manual/fileset.tex @@ -413,7 +413,7 @@ The directives within an Options resource may be one of the following: until the first one that matches. Note, if you exclude a directory, no files or directories below it will be matched. -\item [exclude=yes|no]} +\item [exclude=yes|no] \index[dir]{exclude } The default is {\bf no}. When enabled, any files matched within the Options will be excluded from the backup. diff --git a/docs/manual/recycling.tex b/docs/manual/recycling.tex index 9be49d22..7ec1a867 100644 --- a/docs/manual/recycling.tex +++ b/docs/manual/recycling.tex @@ -29,7 +29,7 @@ Bacula can manage the recycling (such as defined above) automatically. Automatic recycling of Volumes is controlled by three records in the {\bf Pool} resource definition in the Director's configuration file. These three -records are: {\bf +records are: \begin{itemize} \item AutoPrune = yes diff --git a/docs/manual/version.tex b/docs/manual/version.tex index 05f79ff7..6c93bc8f 100644 --- a/docs/manual/version.tex +++ b/docs/manual/version.tex @@ -1 +1 @@ -1.37.18 +1.37.21 -- 2.39.5