diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-11 22:20:33 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-12 07:30:51 +0000 |
commit | 6c38ec1aab82d5347451ba3a0058cd81f4218daa (patch) | |
tree | 292d08f7b02cf417e5b4f4b53b8fd29eb150d0b5 /Makefile.nmake | |
parent | 80df76a28f077824d874102a171758757188fdf9 (diff) |
Update USBPcap installer packaged
NSIS script modified to:
- check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate)
- do not delete the installation folder if not empty
Bug: 11766
Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213
Reviewed-on: https://code.wireshark.org/review/12546
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index b71ac38e4d..c4a63870ad 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1145,7 +1145,7 @@ process_libs: !ENDIF @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . \ - USBPcapSetup-1.1.0.0-g794bf26.exe \ + USBPcapSetup-1.1.0.0-g794bf26-1.exe \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" !IF "$(WIN_SETUP_OPT)" == "--download" @$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" |