diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-12-13 19:28:16 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-12-13 19:28:16 +0000 |
| commit | e73566996463fb1947cf80ad2e11fadce3dc0b66 (patch) | |
| tree | 4c75494b8a5a0e1169c37bcac34cc0aeccda7de2 /src/windows/wintel | |
| parent | 20b3f46e04d4d0104dc971d22793011f20f2e51c (diff) | |
| download | krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.tar.gz krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.tar.xz krb5-e73566996463fb1947cf80ad2e11fadce3dc0b66.zip | |
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/wintel')
| -rw-r--r-- | src/windows/wintel/ChangeLog | 8 | ||||
| -rw-r--r-- | src/windows/wintel/Makefile.in | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 521c68f580..ea8b75ff95 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,11 @@ +Sat Nov 23 00:27:45 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:26 1996 Theodore Y. Ts'o <tytso@mit.edu> + + * Makefile.in (KLIB): Change libkrb5.dll to be krb516.dll + Wed Jun 12 00:22:02 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/wintel/Makefile.in b/src/windows/wintel/Makefile.in index 7134945df0..5f49bcf6ea 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -24,7 +24,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 \ /I$(BUILDTOP)\lib\crypto\des |