diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-23 00:22:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-23 00:22:12 +0000 |
| commit | 7b42cf5135df95fcb2823a88f0366702f25766be (patch) | |
| tree | b026bed3fe630a3e00a8992ec7032d7149a930a9 /packaging | |
| parent | 3bcf0a84bf7c811341874b2ee64e849caefcd762 (diff) | |
| download | wireshark-7b42cf5135df95fcb2823a88f0366702f25766be.tar.gz wireshark-7b42cf5135df95fcb2823a88f0366702f25766be.tar.bz2 wireshark-7b42cf5135df95fcb2823a88f0366702f25766be.zip | |
Use the official kfw packages.
svn path=/trunk/; revision=31355
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 9db5094a4c..b0bf33a5f0 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -140,6 +140,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $( !ENDIF !IF "$(KFW_DIR)" != "" /DKFW_DIR=$(KFW_DIR) \ + /DKFW_PATH=$(KFW_PATH) \ !ENDIF !IF "$(GNUTLS_DIR)" != "" /DGNUTLS_DIR=$(GNUTLS_DIR) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 677647b9af..02c9b04ca4 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -382,9 +382,9 @@ File "${PCRE_DIR}\bin\pcre3.dll" File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt" !endif !ifdef KFW_DIR -File "${KFW_DIR}\bin\comerr32.dll" -File "${KFW_DIR}\bin\krb5_32.dll" -File "${KFW_DIR}\bin\k5sprt32.dll" +File "${KFW_PATH}\comerr32.dll" +File "${KFW_PATH}\krb5_32.dll" +File "${KFW_PATH}\k5sprt32.dll" !endif !ifdef GNUTLS_DIR File "${GNUTLS_DIR}\bin\libgcrypt-11.dll" |