aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-08 09:22:58 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-08-08 09:22:58 +0000
commitd36637e8f5b9201dac9b7420a84290df0b417c2e (patch)
tree4001c87f81c29aed692163eae07d56196d83d71f /packaging/portableapps
parent4f501b3655376861d1e98503badd0ffa6923c494 (diff)
Pass on WinPcap/MSVC redistributable executables to the WiresharkPortable launcher and not the extractor.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3547. svn path=/trunk/; revision=29335
Diffstat (limited to 'packaging/portableapps')
-rw-r--r--packaging/portableapps/win32/makefile.nmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake
index c59d2c41cd..e25f3e2798 100644
--- a/packaging/portableapps/win32/makefile.nmake
+++ b/packaging/portableapps/win32/makefile.nmake
@@ -102,8 +102,6 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/
$(MAKENSIS) \
/DVERSION=$(PAPPS_VERSION) \
/DWSVERSION=$(VERSION) \
- /DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \
- /DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \
/DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \
Installer.nsi
@@ -112,6 +110,8 @@ Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll
/DVERSION=$(PAPPS_VERSION) \
/DWSVERSION=$(VERSION) \
/DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \
+ /DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \
+ /DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \
WiresharkPortable.nsi
clean: