Fix installer to install new pdf docs

diff --git a/bacula/src/win32/win32_installer/Makefile b/bacula/src/win32/win32_installer/Makefile
index 703b80d27e808afba709592abab00df6cf8481c0..d79427adce47006bc7e5c5b284de2b96682c4535 100644 (file)
--- a/bacula/src/win32/win32_installer/Makefile
+++ b/bacula/src/win32/win32_installer/Makefile
@@ -115,10 +115,11 @@ SSL_FILES := \
        openssl.cnf
 
 DOC_FILES := \
-       manual/bacula.pdf \
-       manual/bacula/*.html \
-       manual/bacula/*.png  \
-       manual/bacula/*.css
+       docs/manuals/en/console/console.pdf \
+       docs/manuals/en/main/main.pdf \
+       docs/manuals/en/misc/misc.pdf \
+       docs/manuals/en/problems/problems.pdf \
+       docs/manuals/en/utility/utility.pdf
 
 ##########################################################################
 

diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index 075f8b35261feadc424e6ce6f23b7fce2e340142..700dff63160241661bd20738a04c2ad9e37122f8 100644 (file)
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -860,8 +860,16 @@ Section "Documentation (Acrobat Format)" SecDocPdf
   SetOutPath "$INSTDIR\doc"
   CreateDirectory "$INSTDIR\doc"
 
-  File "${SRC_DIR}\manual\bacula.pdf"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual.lnk" '"$INSTDIR\doc\bacula.pdf"'
+  File "${SRC_DIR}\docs\manuals\en\console\console.pdf"
+  File "${SRC_DIR}\docs\manuals\en\misc\misc.pdf"
+  File "${SRC_DIR}\docs\manuals\en\main\main.pdf"
+  File "${SRC_DIR}\docs\manuals\en\utility\utility.pdf"
+  File "${SRC_DIR}\docs\manuals\en\problems\problems.pdf"
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Console.lnk" '"$INSTDIR\doc\console.pdf"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Main.lnk" '"$INSTDIR\doc\main.pdf"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Misc.lnk" '"$INSTDIR\doc\misc.pdf"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Utility.lnk" '"$INSTDIR\doc\utility.pdf"'
+  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Problems.lnk" '"$INSTDIR\doc\problems.pdf"'
 SectionEnd
 
 Section "Documentation (HTML Format)" SecDocHtml
@@ -870,10 +878,10 @@ Section "Documentation (HTML Format)" SecDocHtml
   SetOutPath "$INSTDIR\doc"
   CreateDirectory "$INSTDIR\doc"
 
-  File "${SRC_DIR}\manual\bacula\*.html"
-  File "${SRC_DIR}\manual\bacula\*.png"
-  File "${SRC_DIR}\manual\bacula\*.css"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'
+; File "${SRC_DIR}\manual\bacula\*.html"
+; File "${SRC_DIR}\manual\bacula\*.png"
+; File "${SRC_DIR}\manual\bacula\*.css"
+; CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'
 SectionEnd
 
 SectionGroupEnd