]> git.sur5r.net Git - bacula/docs/commitdiff
Make developers doc build + make distribution
authorKern Sibbald <kern@sibbald.com>
Mon, 18 Jul 2005 09:03:50 +0000 (09:03 +0000)
committerKern Sibbald <kern@sibbald.com>
Mon, 18 Jul 2005 09:03:50 +0000 (09:03 +0000)
docs/Makefile
docs/Makefile.in
docs/README
docs/autoconf/configure.in
docs/configure
docs/developers/Makefile [deleted file]
docs/developers/Makefile.in [new file with mode: 0644]
docs/developers/version.tex
docs/developers/version.tex.in
docs/manual/Makefile.in

index 72df70af205ae89e5f613d9c7fc1b14eccc7c84c..12ad2bed98757f4650b5c4235ff9d862d6249f58 100644 (file)
@@ -48,6 +48,7 @@ INSTALL_CONFIG = /usr/bin/install -c -m 640
 srcdir =       .
 
 .PATH:         .
+BACULASRC =    /home/kern/bacula/k
 
 basedir = ..
 topdir = ..
@@ -63,6 +64,8 @@ DIST    = Makefile.in
 #-------------------------------------------------------------------------
 
 all:
+       (cd manual; make)
+       (cd developers; make developers)
 
 
 configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
@@ -121,21 +124,16 @@ uninstall:
 distribution:
        rm -rf bacula-doc-*
        mkdir -p bacula-doc-$(VERSION)
-       cp -ap latex/bacula bacula-doc-$(VERSION)/web-manual
+       cp -ap manual/bacula bacula-doc-$(VERSION)/web-manual
        mkdir -p bacula-doc-$(VERSION)/html-manual
-       cp -p latex/bacula.html latex/*.png latex/*.css bacula-doc-$(VERSION)/html-manual/
-       cp -p latex/bacula.pdf bacula-doc-$(VERSION)/
-       cp -p latex/developers.pdf bacula-doc-$(VERSION)/
-       cp -p ../kernstodo bacula-doc-$(VERSION)/
-       cp -p ../ReleaseNotes bacula-doc-$(VERSION)/
-       cp -p ../projects bacula-doc-$(VERSION)/
+       cp -p manual/bacula.html manual/*.png manual/*.css bacula-doc-$(VERSION)/html-manual/
+       cp -p manual/bacula.pdf bacula-doc-$(VERSION)/
+       cp -p developers/developers.pdf bacula-doc-$(VERSION)/
+       cp -p $(BACULASRC)/kernstodo bacula-doc-$(VERSION)/
+       cp -p $(BACULASRC)/ReleaseNotes bacula-doc-$(VERSION)/
+       cp -p $(BACULASRC)/projects bacula-doc-$(VERSION)/
        tar cvfz bacula-doc-$(VERSION).tar.gz bacula-doc-$(VERSION)
-
-distdirs:
-       mkdir $(basedir)/../$(VERNAME)/$(thisdir)
-
-distcopy: distdepend
-       $(CP) -p $(basedir)/$(VERNAME).lsm $(basedir)/../$(VERNAME);
-       $(CP) -p $(DIST)      $(basedir)/../$(VERNAME)/$(thisdir)
-
-distdepend: alldoc
+       rm -rf bacula-doc-$(VERSION)
+       @echo " "
+       @echo "Distribution document is in: bacula-doc-$(VERSION).tar.gz"
+       @echo " "
index 4c73a85614eb091cc5a3e72c8cf7990198cd5ce5..ef021a329740e2e85c586ddc3ad1e0a83f710c3f 100644 (file)
@@ -6,6 +6,7 @@
 srcdir =       @srcdir@
 VPATH =        @srcdir@
 .PATH:         @srcdir@
+BACULASRC =    @bacula@
 
 basedir = ..
 topdir = ..
@@ -21,6 +22,8 @@ DIST    = Makefile.in
 #-------------------------------------------------------------------------
 
 all:
+       (cd manual; make)
+       (cd developers; make developers)
 
 
 configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autoconf/config.h.in
@@ -79,21 +82,16 @@ uninstall:
 distribution:
        rm -rf bacula-doc-*
        mkdir -p bacula-doc-$(VERSION)
-       cp -ap latex/bacula bacula-doc-$(VERSION)/web-manual
+       cp -ap manual/bacula bacula-doc-$(VERSION)/web-manual
        mkdir -p bacula-doc-$(VERSION)/html-manual
-       cp -p latex/bacula.html latex/*.png latex/*.css bacula-doc-$(VERSION)/html-manual/
-       cp -p latex/bacula.pdf bacula-doc-$(VERSION)/
-       cp -p latex/developers.pdf bacula-doc-$(VERSION)/
-       cp -p ../kernstodo bacula-doc-$(VERSION)/
-       cp -p ../ReleaseNotes bacula-doc-$(VERSION)/
-       cp -p ../projects bacula-doc-$(VERSION)/
+       cp -p manual/bacula.html manual/*.png manual/*.css bacula-doc-$(VERSION)/html-manual/
+       cp -p manual/bacula.pdf bacula-doc-$(VERSION)/
+       cp -p developers/developers.pdf bacula-doc-$(VERSION)/
+       cp -p $(BACULASRC)/kernstodo bacula-doc-$(VERSION)/
+       cp -p $(BACULASRC)/ReleaseNotes bacula-doc-$(VERSION)/
+       cp -p $(BACULASRC)/projects bacula-doc-$(VERSION)/
        tar cvfz bacula-doc-$(VERSION).tar.gz bacula-doc-$(VERSION)
-
-distdirs:
-       mkdir $(basedir)/../$(VERNAME)/$(thisdir)
-
-distcopy: distdepend
-       $(CP) -p $(basedir)/$(VERNAME).lsm $(basedir)/../$(VERNAME);
-       $(CP) -p $(DIST)      $(basedir)/../$(VERNAME)/$(thisdir)
-
-distdepend: alldoc
+       rm -rf bacula-doc-$(VERSION)
+       @echo " "
+       @echo "Distribution document is in: bacula-doc-$(VERSION).tar.gz"
+       @echo " "
index f7dc6b43faaaef8d7ba29ef1066c0b740d1f6fc3..a22f2672bfe524637d6ac8a599334ba92ca30de0 100644 (file)
@@ -27,7 +27,15 @@ Web site:  nothing to build, simply copy the files to the
            Web site, then load the documents in the appropriate
            places.
 
+
 English manual:
+   cd <docs>
+   make
+
+   The above builds both the English Bacula document and
+   the developer's document.  When the other languages are
+   ready for distribution, it will also build those languages.
+
    cd manual
    make
 
@@ -48,3 +56,11 @@ developer's manual:
    cd developers
    Same as above.
 
+To create a distribution tar file:
+   cd <docs>
+   make
+   make distribution
+
+   The output will be a .tar.gz file in the current directory
+   with the name bacula-doc-<version>.tar.gz 
+   It will print the name.
index 5daed5acd2b0ecd4bf70eddab368bccdc7732d69..b3536ad857da2a81e62a6dff3a64cb087dae8470 100644 (file)
@@ -96,6 +96,8 @@ AC_OUTPUT([    \
           manual-de/version.tex \
           manual-fr/Makefile \
           manual-fr/version.tex \
+          developers/Makefile \
+          developers/version.tex \
           $PFILES ],  
          [ ]
 )
index ee04843fab453fcdae0178fb53fcac589d00c6e5..adee2a28cc05a84f56aea0f27c3932eb06f68d1d 100755 (executable)
@@ -1768,7 +1768,7 @@ MCOMMON=./autoconf/Make.common
 
 
 
-                                                                                          ac_config_files="$ac_config_files autoconf/Make.common Makefile manual/Makefile manual/version.tex manual-de/Makefile manual-de/version.tex manual-fr/Makefile manual-fr/version.tex $PFILES"
+                                                                                                              ac_config_files="$ac_config_files autoconf/Make.common Makefile manual/Makefile manual/version.tex manual-de/Makefile manual-de/version.tex manual-fr/Makefile manual-fr/version.tex developers/Makefile developers/version.tex $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2332,6 +2332,8 @@ do
   "manual-de/version.tex" ) CONFIG_FILES="$CONFIG_FILES manual-de/version.tex" ;;
   "manual-fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual-fr/Makefile" ;;
   "manual-fr/version.tex" ) CONFIG_FILES="$CONFIG_FILES manual-fr/version.tex" ;;
+  "developers/Makefile" ) CONFIG_FILES="$CONFIG_FILES developers/Makefile" ;;
+  "developers/version.tex" ) CONFIG_FILES="$CONFIG_FILES developers/version.tex" ;;
   "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/docs/developers/Makefile b/docs/developers/Makefile
deleted file mode 100644 (file)
index 808c14b..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-#
-#  Makefile for LaTeX  
-#
-# To build everything do
-#    make tex
-#    make links
-#    make all
-#    make web
-#    make html
-#    make pdf
-#
-# or simply
-#
-#    make
-#
-
-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: developers
-
-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
-.PHONY:
-.DONTCARE:
-
-
-tex:
-       @cp -fp ${IMAGES}/hires/*.eps .
-       @touch baculai-dir.tex baculai-fd.tex baculai-sd.tex \
-            baculai-console.tex baculai-general.tex
-       -latex -interaction=batchmode bacula.tex
-       makeindex bacula.idx -o bacula.ind 2>/dev/null
-       makeindex bacula.ddx -o bacula.dnd >/dev/null 2>/dev/null
-       makeindex bacula.fdx -o bacula.fnd >/dev/null 2>/dev/null
-       makeindex bacula.sdx -o bacula.snd >/dev/null 2>/dev/null
-       makeindex bacula.cdx -o bacula.cnd >/dev/null 2>/dev/null
-       -latex -interaction=batchmode bacula.tex
-       @rm -f *.eps *.old
-
-
-devtex:
-       @cp -fp ${IMAGES}/hires/*.eps .
-       touch developers.idx developersi-general.tex
-       -latex -interaction=batchmode developers.tex
-       makeindex developers.idx >/dev/null 2>/dev/null
-       -latex -interaction=batchmode developers.tex
-       @rm -f *.eps *.old
-
-pdf:
-       @echo "Making pdfm"
-       @cp -fp ${IMAGES}/hires/*.eps .
-       dvipdfm -p a4 bacula.dvi
-       @rm -f *.eps *.old
-
-dvipdf:
-       @echo "Making dvi to pdf"
-       @cp -fp ${IMAGES}/hires/*.eps .
-       dvipdf bacula.dvi bacula.pdf
-       @rm -f *.eps *.old
-
-
-devpdf:
-       @echo "Making developers pdf"
-       @cp -fp ${IMAGES}/hires/*.eps .
-       dvipdf developers.dvi developers.pdf
-       @rm -f *.eps *.old
-
-devpdfm:
-       @echo "Making pdfm"
-       @cp -fp ${IMAGES}/hires/*.eps .
-       dvipdfm -p a4 developers.dvi
-       @rm -f *.eps *.old
-
-html:
-       @echo "Making html"
-       @cp -fp ${IMAGES}/*.eps .
-       latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
-               bacula >/dev/null
-       ./translate_images.pl bacula.html
-       @rm -f *.eps *.gif *.jpg
-
-devhtml:
-       @echo "Making developers html"
-       @./translate_images.pl --from_meaningful_names developers.html
-       @cp -fp ${IMAGES}/*.eps .
-       latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
-               -init_file latex2html-init.pl developers >/dev/null
-       @echo
-       @./translate_images.pl --to_meaningful_names developers.html
-       @rm -f *.eps *.gif *.jpg *.old
-
-
-web:
-       @echo "Making web"
-       @mkdir -p bacula
-       @rm -rf bacula/*
-       @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 -white -notransparent bacula >/dev/null
-       ./translate_images.pl bacula/Bacula_Users_Guide.html
-       @cp -f bacula/Bacula_Users_Guide.html bacula/index.html
-       @cp -f bacula/Bacula_Freque_Asked_Questi.html bacula/faq.html 
-       @rm -f *.eps *.gif *.jpg bacula/*.eps *.old
-
-devweb:
-       @echo "Making developers web"
-       @mkdir -p developers
-       @./translate_images.pl --from_meaningful_names developers/Developers_Guide.html
-       @rm -f developers/*.html
-       @cp -fp ${IMAGES}/*.eps .
-       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
-       @cp -fp ${IMAGES}/*.eps developers/
-       @rm -f developers/next.eps developers/next.png developers/prev.eps developers/prev.png developers/up.eps developers/up.png
-       latex2html -split 5 -local_icons -t "Developer's Guide" -init_file latex2html-init.pl -long_titles 4 \
-               -contents_in_nav -toc_stars -white -notransparent developers >/dev/null
-       @echo
-       @./translate_images.pl --to_meaningful_names developers/Developers_Guide.html
-       @rm -f *.eps *.gif *.jpg developers/*.eps  *.old
-
-texcheck:
-       ./check_tex.pl bacula.tex
-       ./check_tex.pl developers.tex
-
-main_configs:
-       pic2graph -density 100 <main_configs.pic >main_configs.png
-
-clean:
-       @rm -f 1 2 3
-       @rm -f *.png *.gif *.jpg *.eps
-       @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 *.old WARNINGS *.out *.toc *.idx
-       @rm -f images.pl labels.pl internals.pl
-       @rm -rf bacula developers
-       @rm -f baculai-dir.tex baculai-fd.tex baculai-sd.tex \
-            baculai-console.tex baculai-general.tex images.tex developersi.tex
-
-
-distclean:  clean
-       @rm -f bacula.html bacula.pdf developers.html developers.pdf
diff --git a/docs/developers/Makefile.in b/docs/developers/Makefile.in
new file mode 100644 (file)
index 0000000..4e2ab7b
--- /dev/null
@@ -0,0 +1,166 @@
+#
+#
+#  Makefile for LaTeX  
+#
+# To build everything do
+#    make tex
+#    make web
+#    make html
+#    make dvipdf
+#
+# or simply
+#
+#    make
+#
+
+IMAGES=../images
+
+first_rule: bacula
+
+bacula: tex web html dvipdf
+
+developers: devtex devweb devpdf
+
+.SUFFIXES:     .tex .html
+.PHONY:
+.DONTCARE:
+
+
+tex:
+       @cp -fp ${IMAGES}/hires/*.eps .
+       @touch baculai-dir.tex baculai-fd.tex baculai-sd.tex \
+            baculai-console.tex baculai-general.tex
+       -latex -interaction=batchmode bacula.tex
+       makeindex bacula.idx -o bacula.ind 2>/dev/null
+       makeindex bacula.ddx -o bacula.dnd >/dev/null 2>/dev/null
+       makeindex bacula.fdx -o bacula.fnd >/dev/null 2>/dev/null
+       makeindex bacula.sdx -o bacula.snd >/dev/null 2>/dev/null
+       makeindex bacula.cdx -o bacula.cnd >/dev/null 2>/dev/null
+       -latex -interaction=batchmode bacula.tex
+       @rm -f *.eps *.old
+
+
+devtex:
+       @cp -fp ${IMAGES}/hires/*.eps .
+       touch developers.idx developersi-general.tex
+       -latex -interaction=batchmode developers.tex
+       makeindex developers.idx >/dev/null 2>/dev/null
+       -latex -interaction=batchmode developers.tex
+       @rm -f *.eps *.old
+
+pdf:
+       @echo "Making pdfm"
+       @cp -fp ${IMAGES}/hires/*.eps .
+       dvipdfm -p a4 bacula.dvi
+# Rename for loading on Web site
+       @cp -f bacula.pdf dev-bacula.pdf
+       @rm -f *.eps *.old
+
+dvipdf:
+       @echo "Making dvi to pdf"
+       @cp -fp ${IMAGES}/hires/*.eps .
+       dvipdf bacula.dvi bacula.pdf
+# Rename for loading on Web site
+       @cp -f bacula.pdf dev-bacula.pdf
+       @rm -f *.eps *.old
+
+
+devpdf:
+       @echo "Making developers pdf"
+       @cp -fp ${IMAGES}/hires/*.eps .
+       dvipdf developers.dvi developers.pdf
+       @rm -f *.eps *.old
+
+devpdfm:
+       @echo "Making developers pdfm"
+       @cp -fp ${IMAGES}/hires/*.eps .
+       dvipdfm -p a4 developers.dvi
+       @rm -f *.eps *.old
+
+html:
+       @echo " "
+       @echo "Making html"
+       @cp -fp ${IMAGES}/*.eps .
+       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
+       @(if [ -e imagename_translations ] ; then \
+           ./translate_images.pl --from_meaningful_names bacula.html; \
+        fi)
+       latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
+               -init_file latex2html-init.pl bacula >tex.out 2>&1
+       ./translate_images.pl --to_meaningful_names bacula.html
+       @rm -f *.eps *.gif *.jpg
+       @echo "Done making html"
+
+devhtml:
+       @echo "Making developers html"
+       @cp -fp ${IMAGES}/*.eps .
+       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
+       @(if [ -e imagename_translations ] ; then \
+           ./translate_images.pl --from_meaningful_names developers.html; \
+        fi)
+       latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
+               developers >/dev/null
+       ./translate_images.pl --to_meaningful_names developers.html
+       @rm -f *.eps *.gif *.jpg *.old
+
+web:
+       @echo "Making web"
+       @mkdir -p bacula
+       @cp -fp ${IMAGES}/*.eps .
+       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
+       @cp -fp ${IMAGES}/*.eps *.txt bacula
+       @cp -fp ${IMAGES}/*.eps *.txt ${IMAGES}/*.png bacula
+       @rm -f bacula/xp-*.png
+       @rm -f bacula/next.eps bacula/next.png bacula/prev.eps bacula/prev.png bacula/up.eps bacula/up.png
+       @rm -rf bacula/*.html
+       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 >tex.out 2>&1
+       ./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 bacula/*.old
+       @echo "Done making web"
+
+devweb:
+       @echo "Making developers web"
+       @mkdir -p developers
+       @rm -f developers/*
+       @cp -fp ${IMAGES}/*.eps .
+       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
+       @cp -fp ${IMAGES}/*.eps ${IMAGES}/*.png developers/
+       @rm -f developers/next.eps developers/next.png developers/prev.eps developers/prev.png developers/up.eps developers/up.png
+       @(if [ -e developers/imagename_translations ] ; then \
+          ./translate_images.pl --to_meaningful_names developers/Bacula_Users_Guide.html; \
+        fi)
+       @rm -rf developers/*.html
+       latex2html -split 5 -local_icons -t "Developer's Guide" -long_titles 4 \
+               -contents_in_nav -toc_stars -white -notransparent developers >/dev/null
+       ./translate_images.pl --to_meaningful_names developers/Developers_Guide.html
+       @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
+
+main_configs:
+       pic2graph -density 100 <main_configs.pic >main_configs.png
+
+clean:
+       @rm -f 1 2 3
+       @rm -f *.png *.gif *.jpg *.eps
+       @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 imagename_translations
+       @rm -f *.old WARNINGS *.out *.toc *.idx
+       @rm -f images.pl labels.pl internals.pl
+       @rm -rf bacula developers
+       @rm -f baculai-dir.tex baculai-fd.tex baculai-sd.tex \
+            baculai-console.tex baculai-general.tex images.tex developersi.tex
+
+
+distclean:  clean
+       @rm -f bacula.html bacula.pdf dev-bacula.pdf developers.html developers.pdf
index 05f79ff79b402a5057745e8a3f3b12dc747cfaa6..db8ffb443588f22b4f28862a07cdc23f937ead5e 100644 (file)
@@ -1 +1 @@
-1.37.18
+1.37.31 (17 July 2005)
index d78bda93422ecbbca8caf772f7b37f8fe3b254e9..ff66dfc691fb30c7f26d96efbb0ae1051abed9a1 100644 (file)
@@ -1 +1 @@
-@VERSION@
+@VERSION@ (@DATE@)
index f8780fcecc66547a7bcd61ae6c3cb60cb009b4df..4e2ab7b5b3025a61ce9657de997afe1b9d4cb146 100644 (file)
@@ -72,7 +72,7 @@ devpdf:
        @rm -f *.eps *.old
 
 devpdfm:
-       @echo "Making pdfm"
+       @echo "Making developers pdfm"
        @cp -fp ${IMAGES}/hires/*.eps .
        dvipdfm -p a4 developers.dvi
        @rm -f *.eps *.old
@@ -80,17 +80,13 @@ devpdfm:
 html:
        @echo " "
        @echo "Making html"
+       @cp -fp ${IMAGES}/*.eps .
+       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
        @(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 >tex.out 2>&1
-#      @grep -v "opening brace #41" tex.out >1
-#      @mv -f 1 tex.out
-#      @grep "unmatched" tex.out
-       @echo " "
        ./translate_images.pl --to_meaningful_names bacula.html
        @rm -f *.eps *.gif *.jpg
        @echo "Done making html"
@@ -98,29 +94,27 @@ html:
 devhtml:
        @echo "Making developers html"
        @cp -fp ${IMAGES}/*.eps .
+       @rm -f next.eps next.png prev.eps prev.png up.eps up.png
+       @(if [ -e imagename_translations ] ; then \
+           ./translate_images.pl --from_meaningful_names developers.html; \
+        fi)
        latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
                developers >/dev/null
-       ./translate_images.pl developers.html
+       ./translate_images.pl --to_meaningful_names developers.html
        @rm -f *.eps *.gif *.jpg *.old
 
 web:
        @echo "Making web"
        @mkdir -p bacula
-       @cp -fp ${IMAGES}/*.eps *.txt ${IMAGES}/*.png bacula
-       @rm -f bacula/xp-*.png
-       @(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
+       @cp -fp ${IMAGES}/*.eps *.txt ${IMAGES}/*.png bacula
+       @rm -f bacula/xp-*.png
        @rm -f bacula/next.eps bacula/next.png bacula/prev.eps bacula/prev.png bacula/up.eps bacula/up.png
+       @rm -rf bacula/*.html
        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 >tex.out 2>&1
-#      grep -v "opening brace #41" tex.out >1
-#      mv -f 1 tex.out
-#      grep "unmatched" tex.out
        ./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 bacula/*.old
@@ -134,9 +128,13 @@ devweb:
        @rm -f next.eps next.png prev.eps prev.png up.eps up.png
        @cp -fp ${IMAGES}/*.eps ${IMAGES}/*.png developers/
        @rm -f developers/next.eps developers/next.png developers/prev.eps developers/prev.png developers/up.eps developers/up.png
+       @(if [ -e developers/imagename_translations ] ; then \
+          ./translate_images.pl --to_meaningful_names developers/Bacula_Users_Guide.html; \
+        fi)
+       @rm -rf developers/*.html
        latex2html -split 5 -local_icons -t "Developer's Guide" -long_titles 4 \
                -contents_in_nav -toc_stars -white -notransparent developers >/dev/null
-       ./translate_images.pl developers/Developers_Guide.html
+       ./translate_images.pl --to_meaningful_names developers/Developers_Guide.html
        @cp -f developers/Developers_Guide.html developers/index.html
        @rm -f *.eps *.gif *.jpg developers/*.eps  *.old