if HHC_DIR is defined in config.nmake, include the user-guide.chm file into the Win32 installer

svn path=/trunk/; revision=17936
This commit is contained in:
Ulf Lamping 2006-04-20 20:33:04 +00:00
parent 662661f591
commit dd44762c87
2 changed files with 15 additions and 0 deletions

View File

@ -149,6 +149,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
!ENDIF
!IFDEF LUA_DIR
/DLUA_DIR=$(LUA_DIR) \
!ENDIF
!IFDEF HHC_DIR
/DHHC_DIR=$(HHC_DIR) \
!ENDIF
ethereal.nsi

View File

@ -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