Correct Makefile so build after clean works

diff --git a/docs/manual-de/Makefile b/docs/manual-de/Makefile
index cc6da2f1a957c54e1a24f9dbdcf5ac72ba2c2fcf..4e0708453a539d0eeae28dc3e2143a697d3a53f4 100644 (file)
--- a/docs/manual-de/Makefile
+++ b/docs/manual-de/Makefile
@@ -112,7 +112,8 @@ devpdfm:
 
 html:
        @echo "Making html"
-       @./translate_images.pl --from_meaningful_names bacula.html
+#    If you turn on the following, it aborts after a "make clean"
+#      @./translate_images.pl --from_meaningful_names bacula.html
        @cp -fp ${IMAGES}/*.eps .
        latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
                -init_file latex2html-init.pl bacula >/dev/null
@@ -132,7 +133,9 @@ devhtml:
 web:
        @echo "Making web"
        @mkdir -p bacula
-       @./translate_images.pl --from_meaningful_names bacula/Bacula_Users_Guide.html
+       @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
        @rm -rf bacula/*.html
        @cp -fp ${IMAGES}/*.eps .
        @rm -f next.eps next.png prev.eps prev.png up.eps up.png

diff --git a/docs/manual-fr/Makefile b/docs/manual-fr/Makefile
index d7f53e99627dea27934e09d6c1b6508856bea292..4e0708453a539d0eeae28dc3e2143a697d3a53f4 100644 (file)
--- a/docs/manual-fr/Makefile
+++ b/docs/manual-fr/Makefile
@@ -52,7 +52,9 @@ first_rule: bacula
 bacula: tex web html dvipdf
 
 # Note, assume bacula manual was built first
-developers: devtex devweb devhtml devpdf
+#  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:
@@ -75,6 +77,7 @@ tex:
 
 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
@@ -84,6 +87,8 @@ pdf:
        @echo "Making pdfm"
        @cp -fp ${IMAGES}/hires/*.eps .
        dvipdfm -p a4 bacula.dvi
+# Rename for loading on Web site
+       mv bacula.pdf dev-bacula.pdf
        @rm -f *.eps *.old
 
 dvipdf:
@@ -107,13 +112,14 @@ devpdfm:
 
 html:
        @echo "Making html"
-       @./translate_images.pl --from_meaningful_names bacula.html
+#    If you turn on the following, it aborts after a "make clean"
+#      @./translate_images.pl --from_meaningful_names bacula.html
        @cp -fp ${IMAGES}/*.eps .
        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
-       @rm -f *.eps *.gif *.jpg *.old
+       @rm -f *.eps *.gif *.jpg
 
 devhtml:
        @echo "Making developers html"
@@ -127,16 +133,19 @@ devhtml:
 web:
        @echo "Making web"
        @mkdir -p bacula
-       @./translate_images.pl --from_meaningful_names bacula/Bacula_Users_Guide.html
+       @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
        @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 -init_file latex2html-init.pl -contents_in_nav -white -notransparent bacula >/dev/null
+               -toc_stars -contents_in_nav -init_file latex2html-init.pl -white -notransparent bacula >/dev/null
        @echo
        @./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
 
 devweb:
@@ -145,13 +154,13 @@ devweb:
        @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 *.txt developers
+       @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
-       latex2html -split 4 -local_icons -t "Developer's Guide" -auto_nav -long_titles 4 \
+       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
        @cp -f developers/Developers_Guide.html developers/index.html
-       @rm -f *.eps *.gif *.jpg developers/*.eps *.old
+       @rm -f *.eps *.gif *.jpg developers/*.eps  *.old
 
 texcheck:
        ./check_tex.pl bacula.tex

diff --git a/docs/manual/Makefile b/docs/manual/Makefile
index cc6da2f1a957c54e1a24f9dbdcf5ac72ba2c2fcf..4e0708453a539d0eeae28dc3e2143a697d3a53f4 100644 (file)
--- a/docs/manual/Makefile
+++ b/docs/manual/Makefile
@@ -112,7 +112,8 @@ devpdfm:
 
 html:
        @echo "Making html"
-       @./translate_images.pl --from_meaningful_names bacula.html
+#    If you turn on the following, it aborts after a "make clean"
+#      @./translate_images.pl --from_meaningful_names bacula.html
        @cp -fp ${IMAGES}/*.eps .
        latex2html -white -no_subdir -split 0 -toc_stars -white -notransparent \
                -init_file latex2html-init.pl bacula >/dev/null
@@ -132,7 +133,9 @@ devhtml:
 web:
        @echo "Making web"
        @mkdir -p bacula
-       @./translate_images.pl --from_meaningful_names bacula/Bacula_Users_Guide.html
+       @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
        @rm -rf bacula/*.html
        @cp -fp ${IMAGES}/*.eps .
        @rm -f next.eps next.png prev.eps prev.png up.eps up.png