diff options
| author | Gerald Combs <gerald@wireshark.org> | 2003-10-02 22:28:04 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2003-10-02 22:28:04 +0000 |
| commit | d99b8a3abc97e91d0684f5085c1eb0acb2d23a76 (patch) | |
| tree | 8566da74fb12ef743738e5fd30f775fe9e2aff24 /packaging/nsis | |
| parent | 2a4930db308146c58ed6d44154a455096cf69bf5 (diff) | |
Fix document creation under Windows, add ethereal-filter.html to the NSIS
package.
svn path=/trunk/; revision=8596
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 3 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 6913916ce0..74ac7e456a 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.20 2003/08/05 05:05:58 guy Exp $ +# $Id: Makefile.nmake,v 1.21 2003/10/02 22:28:04 gerald Exp $ # # NSIS is a free packager/installer/uninstaller program for Win32. # It was originally written for the Winamp package, but various @@ -14,6 +14,7 @@ EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \ DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll DOC=../../doc/ethereal.html \ ../../doc/tethereal.html \ + ../../doc/ethereal-filter.html \ ../../doc/editcap.html \ ../../doc/text2pcap.html \ ../../doc/mergecap.html \ diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 3dc302754f..a7ce44e603 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.18 2003/08/05 05:05:59 guy Exp $ +; $Id: ethereal.nsi,v 1.19 2003/10/02 22:28:04 gerald Exp $ ; ============================================================================ ; Header configuration @@ -113,6 +113,7 @@ Section "Ethereal" SetOutPath $INSTDIR File "..\..\ethereal.exe" File "..\..\doc\ethereal.html" +File "..\..\doc\ethereal-filter.html" !ifndef GTK2 !ifndef GLIB2 File "${COMMON_FILES_GNU}\gtk-1.3.dll" @@ -203,7 +204,8 @@ Delete "$SMPROGRAMS\Ethereal\Ethereal Web Site.lnk" WriteINIStr "$SMPROGRAMS\Ethereal\Ethereal Web Site.url" \ "InternetShortcut" "URL" "http://www.ethereal.com/" CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\ethereal.exe" -CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Documentation.lnk" "$INSTDIR\ethereal.html" +CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Manual.lnk" "$INSTDIR\ethereal.html" +CreateShortCut "$SMPROGRAMS\Ethereal\Display Filters Manual.lnk" "$INSTDIR\ethereal-filters.html" CreateShortCut "$SMPROGRAMS\Ethereal\Uninstall.lnk" "$INSTDIR\uninstall.exe" CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Program Directory.lnk" \ "$INSTDIR" |