aboutsummaryrefslogtreecommitdiff
path: root/src/windows/cns
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1996-12-13 19:28:16 +0000
committerTheodore Tso <tytso@mit.edu>1996-12-13 19:28:16 +0000
commite73566996463fb1947cf80ad2e11fadce3dc0b66 (patch)
tree4c75494b8a5a0e1169c37bcac34cc0aeccda7de2 /src/windows/cns
parent20b3f46e04d4d0104dc971d22793011f20f2e51c (diff)
downloadkrb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.zip
krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.tar.gz
krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.tar.bz2
Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*
include the doc subtree!!) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9632 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/cns')
-rw-r--r--src/windows/cns/ChangeLog8
-rw-r--r--src/windows/cns/Makefile.in2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index 3ca9e96..6526c65 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,11 @@
+Sat Nov 23 00:26:44 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Makefile.in (KLIB): Change krb516.dll to krb5_16.dll. [PR#204]
+
+Wed Nov 20 18:32:06 1996 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * Makefile.in (KLIB): Change libkrb5.dll to be krb516.dll
+
Wed Jun 12 00:20:08 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* makefile: Renamed to Makefile.in, so that we can do WIN16/WIN32
diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 3fae32b..6ef265c 100644
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -23,7 +23,7 @@ XOBJS =
!if $(KVERSION) == 5
BUILDTOP =..\..
LIBDIR = $(BUILDTOP)\lib
-KLIB = $(LIBDIR)\libkrb5.lib
+KLIB = $(LIBDIR)\krb5_16.lib
WLIB = $(LIBDIR)\winsock.lib
INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
XOBJS = kpasswd.obj