3 files changed, 20 insertions, 15 deletions
diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile
index dd904478fcc..b25468dc707 100644
--- a/usr.bin/ssh/lib/Makefile
+++ b/usr.bin/ssh/lib/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2001/06/26 16:15:25 dugsong Exp $
+#	$OpenBSD: Makefile,v 1.29 2001/06/26 17:52:41 dugsong Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -21,11 +21,14 @@ install:
 
 .if (${KERBEROS:L} == "yes")
 CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
-CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
 .if (${AFS:L} == "yes")
 CFLAGS+= -DAFS
 SRCS+=  radix.c
 .endif # AFS
 .endif # KERBEROS
 
+.if (${KERBEROS5:L} == "yes")
+CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
+.endif # KERBEROS5
+
 .include <bsd.lib.mk>
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index 36852c902fc..21170eb5c12 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.31 2001/06/26 16:15:26 dugsong Exp $
+#	$OpenBSD: Makefile,v 1.32 2001/06/26 17:52:41 dugsong Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -21,11 +21,6 @@ SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
 LDADD+=	 -lkrb
 DPADD+=	 ${LIBKRB}
-
-CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
-LDADD+=  -lkrb5 -lasn1
-DPADD+=  ${LIBKRB5} ${LIBASN1}
-
 .if (${AFS:L} == "yes")
 CFLAGS+= -DAFS
 LDADD+=  -lkafs
@@ -33,6 +28,12 @@ DPADD+=  ${LIBKRBAFS}
 .endif # AFS
 .endif # KERBEROS
 
+.if (${KERBEROS5:L} == "yes")
+CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
+LDADD+=  -lkrb5 -lasn1
+DPADD+=  ${LIBKRB5} ${LIBASN1}
+.endif # KERBEROS5
+
 .include <bsd.prog.mk>
 
 LDADD+=	-lcrypto -lz
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 6682f0e1f52..3a4b9fdce45 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.41 2001/06/26 16:15:26 dugsong Exp $
+#	$OpenBSD: Makefile,v 1.42 2001/06/26 17:52:41 dugsong Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -23,18 +23,19 @@ CFLAGS+= -DAFS
 LDADD+=  -lkafs
 DPADD+=  ${LIBKRBAFS}
 .endif # AFS
-
-CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV
-SRCS+=  auth-krb5.c
-LDADD+= -lkrb5 -lkafs -lasn1
-DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1}
-
 CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
 SRCS+=	auth-krb4.c
 LDADD+=	 -lkrb
 DPADD+=	 ${LIBKRB}
 .endif # KERBEROS
 
+.if (${KERBEROS5:L} == "yes")
+CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV
+SRCS+=  auth-krb5.c
+LDADD+= -lkrb5 -lkafs -lasn1
+DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1}
+.endif # KERBEROS5
+
 .include <bsd.prog.mk>
 
 LDADD+=	-lcrypto -lutil -lz