From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 19 Jun 2009 04:14:52 +0000 (+0000)
Subject: DEVEL15-windows-installer-nsis-20090615
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e6b33f7a8bab7611fca626ec45d797ab1322f5a7

DEVEL15-windows-installer-nsis-20090615

LICENSE MIT

reorder some operations and make sure that directories are created
before the installer attempts to generate files into them.


(cherry picked from commit 3e26e46b660f2e92eb9c693f9a3c4f97f2acd80c)
---

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index aea4201..75a16e5 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -1026,17 +1026,23 @@ Section /o "Supplemental Documentation" secDocs
    
    
 DoEnglish:
+   CreateDirectory "$INSTDIR\Documentation"
+   SetOutPath "$INSTDIR\Documentation\"
+   File /oname=AdminGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
+   File /oname=UserGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
+   CreateDirectory "$INSTDIR\Documentation\html"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef"
    File "..\..\..\..\doc\man-pages\html\*"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef\1"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef\1"
    File "..\..\..\..\doc\man-pages\html\1\*"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef\5"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef\5"
    File "..\..\..\..\doc\man-pages\html\5\*"
+   CreateDirectory "$INSTDIR\Documentation\html\CmdRef\8"
    SetOutPath "$INSTDIR\Documentation\html\CmdRef\8"
    File "..\..\..\..\doc\man-pages\html\8\*"
-   SetOutPath "$INSTDIR\Documentation\"
-   File /oname=AdminGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
-   File /oname=UserGuide.chm "..\..\..\..\doc\xml\AdminGuide\htmlhelp.chm"
    goto DoneLanguage
    
 DoGerman:
@@ -2901,6 +2907,7 @@ Function AFSLangFiles
    
 DoEnglish:
 
+   CreateDirectory "$INSTDIR\Documentation"
    SetOutPath "$INSTDIR\Documentation"
    File /oname=ReleaseNotes.chm "..\..\..\..\doc\xml\ReleaseNotesWindows\htmlhelp.chm"