osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix document creation under Windows, add ethereal-filter.html to the NSIS 

package.

svn path=/trunk/; revision=8596
This commit is contained in:
Gerald Combs 2003-10-02 22:28:04 +00:00
parent 2a4930db30
commit d99b8a3abc
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/Makefile.nmake
View File

@ -1,7 +1,7 @@
# Makefile.nmake
# Nmake file for Ethereal documentation
#
# $Id: Makefile.nmake,v 1.9 2003/10/01 19:44:05 guy Exp $
# $Id: Makefile.nmake,v 1.10 2003/10/02 22:28:04 gerald Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -26,8 +26,8 @@
include ../config.nmake
doc: ethereal.html tethereal.html editcap.html idl2eth.html \
mergecap.html text2pcap.html
doc: ethereal.html tethereal.html ethereal-filter.html editcap.html \
idl2eth.html mergecap.html text2pcap.html
ethereal.1: ethereal.pod ../config.h
$(POD2MAN) \
@ -58,9 +58,6 @@ tethereal.html: tethereal.pod ../config.h
--noindex \
tethereal.pod > tethereal.html
tethereal.pod: tethereal.pod.template ../tethereal.exe
..\\tethereal.exe -G | $(PERL) dfilter2pod.pl tethereal.pod.template > tethereal.pod
ethereal-filter.4: ethereal-filter.pod ../config.h
$(POD2MAN) \
--center="The Ethereal Network Analyzer" \
@ -125,8 +122,9 @@ text2pcap.html: text2pcap.pod ../config.h
text2pcap.pod > text2pcap.html
clean:
rm -f ethereal.html ethereal.1 ethereal.pod
rm -f tethereal.html tethereal.1 tethereal.pod
rm -f ethereal.html ethereal.1
rm -f tethereal.html tethereal.1
rm -f ethereal-filter.html ethereal-filter.4 ethereal-filter.pod
rm -f editcap.html editcap.1
rm -f idl2eth.html idl2eth.1
rm -f mergecap.html mergecap.1

3
packaging/nsis/Makefile.nmake
View File

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

6
packaging/nsis/ethereal.nsi
View File

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