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 /Makefile.nmake | |
| 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 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 92581610f7..61783949d7 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1227,17 +1227,9 @@ install-generated-files: doc if not exist $(INSTALL_DIR)\extcap mkdir $(INSTALL_DIR)\extcap if exist androiddump.exe xcopy androiddump.exe $(INSTALL_DIR)\extcap /d if exist androiddump.pdb xcopy androiddump.pdb $(INSTALL_DIR)\extcap /d - xcopy ".\wiretap\wiretap-$(WTAP_VERSION).dll" $(INSTALL_DIR)\extcap /d - xcopy ".\wsutil\libwsutil.dll" $(INSTALL_DIR)\extcap /d - xcopy $(GTK_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR)\extcap /d - xcopy $(GTK_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR)\extcap /d - xcopy $(ZLIB_DIR)\zlib1.dll $(INSTALL_DIR)\extcap /d - xcopy $(GTK_DIR)\bin\$(INTL_DLL) $(INSTALL_DIR)\extcap /d -!IFDEF GNUTLS_DIR - xcopy $(GNUTLS_DIR)\bin\$(GCC_DLL) $(INSTALL_DIR)\extcap /d - xcopy $(GNUTLS_DIR)\bin\libgcrypt-20.dll $(INSTALL_DIR)\extcap /d - xcopy $(GNUTLS_DIR)\bin\$(GPGERROR_DLL) $(INSTALL_DIR)\extcap /d -!ENDIF + if not exist $(INSTALL_DIR_QT)\extcap mkdir $(INSTALL_DIR_QT)\extcap + if exist androiddump.exe xcopy androiddump.exe $(INSTALL_DIR_QT)\extcap /d + if exist androiddump.pdb xcopy androiddump.pdb $(INSTALL_DIR_QT)\extcap /d if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d if exist captype.exe xcopy captype.exe $(INSTALL_DIR) /d |