diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-09-22 12:46:29 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-09-22 11:52:26 +0000 |
| commit | 0402020f67bc47736ce2a9a4eb3942ae9bb3620e (patch) | |
| tree | 35b74abf0b8ae78fe838f4323b2f16371972b613 /packaging | |
| parent | 8eb068a6038de6709325bb2f5c4fa958492c028e (diff) | |
| download | wireshark-0402020f67bc47736ce2a9a4eb3942ae9bb3620e.tar.gz wireshark-0402020f67bc47736ce2a9a4eb3942ae9bb3620e.tar.bz2 wireshark-0402020f67bc47736ce2a9a4eb3942ae9bb3620e.zip | |
nsis: Always create the extcap directory
Change-Id: I6955c242036c3aa76be4ceb545905ffeef906518
Reviewed-on: https://code.wireshark.org/review/23654
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit ed967507848f09ea4320c3bde36cf9020731793d)
Reviewed-on: https://code.wireshark.org/review/23655
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 4d9c4eab80..ddaa6c5bcd 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -755,6 +755,9 @@ File "${STAGING_DIR}\dtds\xcap-error.dtd" File "${STAGING_DIR}\dtds\watcherinfo.dtd" SetOutPath $INSTDIR +; Create the extcap directory +CreateDirectory $INSTDIR\extcap + ; Install the TPNCP DAT file in the "tpncp" subdirectory ; of the installation directory. SetOutPath $INSTDIR\tpncp @@ -878,7 +881,6 @@ ${If} $0 == "0" ${EnableX64FSRedirection} SetRegView 32 ${EndIf} - CreateDirectory $INSTDIR\extcap ${StrRep} $0 '$USBPCAP_UNINSTALL' 'Uninstall.exe' 'USBPcapCMD.exe' ${StrRep} $1 '$0' '"' '' CopyFiles /SILENT $1 $INSTDIR\extcap |