diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-10-20 20:06:44 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-10-20 20:06:44 +0000 |
| commit | fecd95b382f18f76d37e3fbddbbacd511af54e24 (patch) | |
| tree | ef3bfc1c708ab2d2b54f2042717748be777c7be0 /packaging | |
| parent | 58bbda182ad3d62b1bf1daca4dcaef8f02dd3136 (diff) | |
don't fail to create an installer if LUA_DIR or NET_SNMP_DIR are not defined (both optional)
svn path=/trunk/; revision=19642
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index d4167f98d3..84f4c40a25 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -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 diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index afe0b2b361..1ebeb63870 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -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" |