aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-10-13 21:37:01 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2014-10-13 20:15:27 +0000
commit89a95f22056c1be1e5f6eb6da1520302a3f6b3e0 (patch)
tree58018a1d4fd90382a5c07cde030553910977121f /packaging
parent1f481258da05feb9ff165f586292330427c841a9 (diff)
Add Kerberos 3.2.2 package for Win64
Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb Reviewed-on: https://code.wireshark.org/review/4661 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake3
-rw-r--r--packaging/nsis/wireshark.nsi6
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 0b158f28f7..be74fae3ea 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -202,6 +202,9 @@ NSIS_FLAGS=\
!IF "$(KFW_DIR)" != ""
/DKFW_DIR=$(KFW_DIR) \
/DKFW_PATH=$(KFW_PATH) \
+ /DCOMERR_DLL=$(COMERR_DLL) \
+ /DKRB5_DLL=$(KRB5_DLL) \
+ /DK5SPRT_DLL=$(K5SPRT_DLL) \
!ENDIF
!IF "$(GNUTLS_DIR)" != ""
/DGPGERROR_DLL=$(GPGERROR_DLL) \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 724c425206..d8d96884aa 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -344,9 +344,9 @@ File "${STAGING_DIR}\libcares-2.dll"
File "${STAGING_DIR}\adns_dll.dll"
!endif
!ifdef KFW_DIR
-File "${STAGING_DIR}\comerr32.dll"
-File "${STAGING_DIR}\krb5_32.dll"
-File "${STAGING_DIR}\k5sprt32.dll"
+File "${STAGING_DIR}\${COMERR_DLL}"
+File "${STAGING_DIR}\${KRB5_DLL}"
+File "${STAGING_DIR}\${K5SPRT_DLL}"
!endif
!ifdef GNUTLS_DIR
File "${STAGING_DIR}\libffi-6.dll"