diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-13 17:11:15 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-15 20:26:13 +0000 |
| commit | 40ce324f4d0beda62a957f5f6c47dcc9ac5c5c18 (patch) | |
| tree | c20e9a349a21b8e77e7d95420b0954550e17a51c /packaging/nsis/wireshark.nsi | |
| parent | 05c0152370cbe084193ad2946e6fc96a1017c08e (diff) | |
Set the extcap working directory on Windows.
On Windows, prepend the main program directory to %Path% when spawning
extcap processes. This lets us place androiddump in extcap while allowing
it to locate its DLLs.
Change-Id: I406c47ce71323266d5f14fb596931398464e452d
Reviewed-on: https://code.wireshark.org/review/8057
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 4af80f7b58..09e20b5ff8 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -987,10 +987,10 @@ SectionEnd Section /o "Androiddump" SecAndroiddumpinfos ;------------------------------------------- -SetOutPath $INSTDIR\extcap +SetOutPath $INSTDIR File "${STAGING_DIR}\androiddump.html" +SetOutPath $INSTDIR\extcap File "${STAGING_DIR}\extcap\androiddump.exe" -File "${STAGING_DIR}\extcap\*.dll" SectionEnd SectionGroupEnd ; "Tools" |