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

don't fail to create an installer if LUA_DIR or NET_SNMP_DIR are not defined (both optional) 

svn path=/trunk/; revision=19642
This commit is contained in:
Ulf Lamping 2006-10-20 20:06:44 +00:00
parent 58bbda182a
commit fecd95b382
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/Makefile.nmake
View File

@ -131,7 +131,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
/DGETTEXT_DIR=$(GETTEXT_DIR) \
/DVERSION=$(VERSION) \
/DWTAP_VERSION=$(WTAP_VERSION) \
!IF "$(NET_SNMP_DIR)" != ""
/DNET_SNMP_DIR=$(NET_SNMP_DIR) \
!ENDIF
!IF "$(ADNS_DIR)" != ""
/DADNS_DIR=$(ADNS_DIR) \
!ENDIF

8
packaging/nsis/wireshark.nsi
View File

@ -331,6 +331,9 @@ File "${GNUTLS_DIR}\bin\libtasn1-3.dll"
!endif
!ifdef LUA_DIR
File "${LUA_DIR}\lib\dll\lua5.1.dll"
File "..\..\epan\wslua\init.lua"
File "..\..\epan\wslua\console.lua"
File "..\..\epan\wslua\dtd_gen.lua"
!endif
File "..\..\FAQ"
File "..\..\README"
@ -343,9 +346,6 @@ File "..\..\doc\wireshark.html"
File "..\..\doc\wireshark-filter.html"
File "..\..\dumpcap.exe"
File "..\..\doc\dumpcap.html"
File "..\..\epan\wslua\init.lua"
File "..\..\epan\wslua\console.lua"
File "..\..\epan\wslua\dtd_gen.lua"
; global config files - don't overwrite if already existing
;IfFileExists cfilters dont_overwrite_cfilters
@ -751,6 +751,7 @@ File "..\..\plugins\mate\mate.dll"
SectionEnd
!ifdef NET_SNMP_DIR
Section "SNMP MIBs" SecMIBs
;-------------------------------------------
!ifdef GTK1_DIR & GTK2_DIR
@ -759,6 +760,7 @@ SectionIn 1 2
SetOutPath $INSTDIR\snmp\mibs
File "${NET_SNMP_DIR}\mibs\*.txt"
SectionEnd
!endif
SectionGroupEnd ; "Plugins / Extensions"