aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-12-01 10:05:16 +0000
committerJörg Mayer <jmayer@loplof.de>2013-12-01 10:05:16 +0000
commit244000000d1249cb2243df2229aa1ca0c0dceabb (patch)
tree33e502c033664c2c8128a807f29dece1005090f3 /packaging/portableapps
parent6cd4ad721f94b5b2c4e5136bad179eb83585f150 (diff)
- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
Diffstat (limited to 'packaging/portableapps')
-rw-r--r--packaging/portableapps/win32/Makefile.nmake4
-rw-r--r--packaging/portableapps/win32/WiresharkPortable.tmpl2
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index aebe11f805..41501b8d77 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -89,7 +89,7 @@ appinfo.ini: appinfo.tmpl $(TOPDIR)\config.nmake
< appinfo.tmpl > appinfo.ini
WiresharkPortable.ini: WiresharkPortable.tmpl $(TOPDIR)\config.nmake
- sed -e 's/$$(PCAP_VERSION)/$(PCAP_VERSION)/g' \
+ sed -e 's/$$(WINPCAP_VERSION)/$(WINPCAP_VERSION)/g' \
-e 's/$$(TARGET_MACHINE)/$(TARGET_MACHINE)/g' \
< WiresharkPortable.tmpl > WiresharkPortable.ini
@@ -127,7 +127,7 @@ Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll
/DVERSION=$(PAPPS_VERSION) \
/DWSVERSION=$(VERSION) \
/DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \
- /DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \
+ /DDEFAULTWINPCAP=WinPcap_$(WINPCAP_VERSION).exe \
/DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \
WiresharkPortable.nsi
diff --git a/packaging/portableapps/win32/WiresharkPortable.tmpl b/packaging/portableapps/win32/WiresharkPortable.tmpl
index 5df8528f9f..57b19e7fe7 100644
--- a/packaging/portableapps/win32/WiresharkPortable.tmpl
+++ b/packaging/portableapps/win32/WiresharkPortable.tmpl
@@ -10,7 +10,7 @@ WiresharkExecutable=wireshark.exe
AdditionalParameters=
DisableWinPcapInstall=false
-WinPcapInstaller=WinPcap_$(PCAP_VERSION).exe
+WinPcapInstaller=WinPcap_$(WINPCAP_VERSION).exe
MSVCRedist=vcredist_$(TARGET_MACHINE).exe