diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-23 00:22:12 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-23 00:22:12 +0000 |
| commit | a4da5c7613dd326b13fba6ea9f1dc43077243fa5 (patch) | |
| tree | b026bed3fe630a3e00a8992ec7032d7149a930a9 /Makefile.nmake | |
| parent | 14b13348c1d767b425b182d568facd5aa8013190 (diff) | |
Use the official kfw packages.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31355 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index f92149ac1b..570e5fb26f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -744,7 +744,9 @@ process_libs: !ENDIF !IFDEF KFW_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . kfw-3.2.2-ws1.zip + . kfw-3-2-2-sdk.zip + @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ + . kfw-3-2-2.zip !ENDIF !IFDEF PCAP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -1019,9 +1021,9 @@ install-all: install-generated-files xcopy $(PCRE_DIR)\man\cat3\pcrepattern.3.txt $(INSTALL_DIR) /d !ENDIF !IFDEF KFW_DIR - xcopy $(KFW_DIR)\bin\comerr32.dll $(INSTALL_DIR) /d - xcopy $(KFW_DIR)\bin\krb5_32.dll $(INSTALL_DIR) /d - xcopy $(KFW_DIR)\bin\k5sprt32.dll $(INSTALL_DIR) /d + xcopy $(KFW_PATH)\comerr32.dll $(INSTALL_DIR) /d + xcopy $(KFW_PATH)\krb5_32.dll $(INSTALL_DIR) /d + xcopy $(KFW_PATH)\k5sprt32.dll $(INSTALL_DIR) /d !ENDIF !IFDEF GNUTLS_DIR xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d |