diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-03-18 16:32:54 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-03-18 23:47:38 +0000 |
| commit | a6da14982b2df222af81f89fa2db95b07fdf0388 (patch) | |
| tree | 66323388056a639bbc29da01d5a2e41f9b49ba5c /packaging/nsis/config.nsh.in | |
| parent | 36ba6b87c1545b5c93c498556ac0db74c5965a9c (diff) | |
NSIS: Fix our extra installer location.
We know the native Windows library path early on in the configure
process. Use it to set the location of the Npcap and USBPcap installers
instead of trying to derive it from the GLib DLL path.
Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
Reviewed-on: https://code.wireshark.org/review/32475
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/config.nsh.in')
| -rw-r--r-- | packaging/nsis/config.nsh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 78ae18092e..c20ff93471 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -9,7 +9,7 @@ #define TOP_SRC_DIR "@TOP_SRC_DIR@" #define WIRESHARK_TARGET_PLATFORM @WIRESHARK_TARGET_PLATFORM@ #define TARGET_MACHINE @TARGET_MACHINE@ -#define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@" +#define EXTRA_INSTALLER_DIR "@EXTRA_INSTALLER_DIR@" #define NPCAP_PACKAGE_VERSION @NPCAP_PACKAGE_VERSION@ #define USBPCAP_PACKAGE_VERSION @USBPCAP_PACKAGE_VERSION@ #define VERSION @VERSION@ |