diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-04-20 20:33:04 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-04-20 20:33:04 +0000 |
| commit | dd44762c875757e13fe98387cccf5b07c89b53ff (patch) | |
| tree | cdc2cedfd5b511ac962835a8a90f41c622581876 | |
| parent | 662661f5919fc2dc1182c249db3bb5b60f1c79fa (diff) | |
if HHC_DIR is defined in config.nmake, include the user-guide.chm file into the Win32 installer
svn path=/trunk/; revision=17936
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 355bd2ef15..68f389d0e2 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -150,6 +150,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake !IFDEF LUA_DIR /DLUA_DIR=$(LUA_DIR) \ !ENDIF +!IFDEF HHC_DIR + /DHHC_DIR=$(HHC_DIR) \ +!ENDIF ethereal.nsi clean: diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index ff5064129c..2e753fb71b 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -787,6 +787,16 @@ SectionEnd SectionGroupEnd ; "Tools" +!ifdef HHC_DIR +Section "User's Guide" SecUsersGuide +;------------------------------------------- +!ifdef GTK1_DIR & GTK2_DIR +SectionIn 1 2 +!endif +SetOutPath $INSTDIR +File "..\..\docbook\user-guide.chm" +SectionEnd +!endif Section "Uninstall" un.SecUinstall ;------------------------------------------- @@ -886,6 +896,7 @@ Delete "$INSTDIR\FAQ" Delete "$INSTDIR\NEWS.txt" Delete "$INSTDIR\manuf" Delete "$INSTDIR\pcrepattern.3.txt" +Delete "$INSTDIR\user-guide.chm" Delete "$INSTDIR\radius\*.*" Delete "$INSTDIR\dtds\*.*" Delete "$SMPROGRAMS\Ethereal\*.*" @@ -1006,6 +1017,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Text2pcap is a program that reads in an ASCII hex dump and writes the data into a libpcap-style capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Mergecap is a program that combines multiple saved capture files into a single output file" !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Capinfos is a program that provides information on capture files." + !insertmacro MUI_DESCRIPTION_TEXT ${SecUsersGuide} "The user's guide as the online help system." !insertmacro MUI_FUNCTION_DESCRIPTION_END !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN |