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:
parent
58bbda182a
commit
fecd95b382
|
@ -131,7 +131,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
|
||||||
/DGETTEXT_DIR=$(GETTEXT_DIR) \
|
/DGETTEXT_DIR=$(GETTEXT_DIR) \
|
||||||
/DVERSION=$(VERSION) \
|
/DVERSION=$(VERSION) \
|
||||||
/DWTAP_VERSION=$(WTAP_VERSION) \
|
/DWTAP_VERSION=$(WTAP_VERSION) \
|
||||||
|
!IF "$(NET_SNMP_DIR)" != ""
|
||||||
/DNET_SNMP_DIR=$(NET_SNMP_DIR) \
|
/DNET_SNMP_DIR=$(NET_SNMP_DIR) \
|
||||||
|
!ENDIF
|
||||||
!IF "$(ADNS_DIR)" != ""
|
!IF "$(ADNS_DIR)" != ""
|
||||||
/DADNS_DIR=$(ADNS_DIR) \
|
/DADNS_DIR=$(ADNS_DIR) \
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
|
@ -331,6 +331,9 @@ File "${GNUTLS_DIR}\bin\libtasn1-3.dll"
|
||||||
!endif
|
!endif
|
||||||
!ifdef LUA_DIR
|
!ifdef LUA_DIR
|
||||||
File "${LUA_DIR}\lib\dll\lua5.1.dll"
|
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
|
!endif
|
||||||
File "..\..\FAQ"
|
File "..\..\FAQ"
|
||||||
File "..\..\README"
|
File "..\..\README"
|
||||||
|
@ -343,9 +346,6 @@ File "..\..\doc\wireshark.html"
|
||||||
File "..\..\doc\wireshark-filter.html"
|
File "..\..\doc\wireshark-filter.html"
|
||||||
File "..\..\dumpcap.exe"
|
File "..\..\dumpcap.exe"
|
||||||
File "..\..\doc\dumpcap.html"
|
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
|
; global config files - don't overwrite if already existing
|
||||||
;IfFileExists cfilters dont_overwrite_cfilters
|
;IfFileExists cfilters dont_overwrite_cfilters
|
||||||
|
@ -751,6 +751,7 @@ File "..\..\plugins\mate\mate.dll"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
|
|
||||||
|
!ifdef NET_SNMP_DIR
|
||||||
Section "SNMP MIBs" SecMIBs
|
Section "SNMP MIBs" SecMIBs
|
||||||
;-------------------------------------------
|
;-------------------------------------------
|
||||||
!ifdef GTK1_DIR & GTK2_DIR
|
!ifdef GTK1_DIR & GTK2_DIR
|
||||||
|
@ -759,6 +760,7 @@ SectionIn 1 2
|
||||||
SetOutPath $INSTDIR\snmp\mibs
|
SetOutPath $INSTDIR\snmp\mibs
|
||||||
File "${NET_SNMP_DIR}\mibs\*.txt"
|
File "${NET_SNMP_DIR}\mibs\*.txt"
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
!endif
|
||||||
|
|
||||||
SectionGroupEnd ; "Plugins / Extensions"
|
SectionGroupEnd ; "Plugins / Extensions"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue