aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2017-09-22 12:46:29 +0200
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2017-09-22 11:51:44 +0000
commited967507848f09ea4320c3bde36cf9020731793d (patch)
treeebae54426b7d5ad8bec6e3838c4656fe898e3d15 /packaging
parentb4fc86d2d5cd293c19b8c1e9db3d50e5fe0283ab (diff)
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>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/wireshark.nsi4
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index d848b08..03e8a01 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -759,6 +759,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
@@ -882,7 +885,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