5 files changed, 8 insertions, 6 deletions

diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 6bbe88634cc8c..4c7615ae3df64 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -18,7 +18,7 @@ CFLAGS+=-DKLOGIN_PARANOID
 DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
 LDADD=	-lutil -lskey -lmd -lcrypt
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(LC_AUTH)
 CFLAGS+=-DKERBEROS
 SRCS+=	klogin.c
 DPADD+=	${LIBKRB} ${LIBDES}
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 117be93f44fb4..4909e57f0f1a8 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.27 1998/03/06 14:02:04 bde Exp $
+# $Id$
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
@@ -55,7 +55,7 @@ MAN1=passwd.1
 LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS=passwd.1 yppasswd.1
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS4))
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && (defined(MAKE_KERBEROS4))
 SRCS+=	kpasswd_standalone.c
 .PATH:	${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 746e4a462fdcc..e3d594c32f2fe 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
+#	$Id$
 
 PROG=	rlogin
 SRCS=	rlogin.c
@@ -8,7 +9,7 @@ BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c encrypt.c
 DPADD=	${LIBKRB} ${LIBDES}
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index e01c80deed89b..4f5f0c3552bf6 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,10 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
+#	$Id$
 
 PROG=	rsh
 SRCS=	rsh.c
 CFLAGS+=-Wall
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c encrypt.c
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../rlogin -I${.CURDIR} -I- \
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index ff98997599687..e468065bd0632 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -19,7 +19,7 @@ COPTS+=	-DWHEELSU
 .endif
 CFLAGS+= -Wall
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) \
+.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) \
 	&& !defined(LC_AUTH)
 CFLAGS+=-DKERBEROS
 DPADD+=	${LIBKRB} ${LIBDES}