From 2e761cd11a600499201ca8eb3bc81d1fec5a3c25 Mon Sep 17 00:00:00 2001
From: John Hay <jhay@FreeBSD.org>
Date: Mon, 3 Dec 2001 17:45:25 +0000
Subject: [PATCH] Add the necessary paths to the kerberos libraries and
 includes.

This fix "make release".

Reviewed by:	markm
---
 kerberos5/lib/libtelnet/Makefile   | 2 +-
 kerberos5/libexec/telnetd/Makefile | 3 ++-
 kerberos5/usr.bin/telnet/Makefile  | 3 ++-
 kerberosIV/usr.bin/telnet/Makefile | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index f119212fffac..3a6dfe1d0390 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -13,7 +13,7 @@ SRCS+=		kerberos5.c
 #WARNS?=		2
 
 CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
-CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
+CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
 
 INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa
diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile
index f92ac71b3df7..f44a63af563e 100644
--- a/kerberos5/libexec/telnetd/Makefile
+++ b/kerberos5/libexec/telnetd/Makefile
@@ -20,7 +20,8 @@ DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
 		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
 		${LIBCRYPT} ${LIBPAM}
 LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
-		-lkrb5 -lasn1 -lroken -lcom_err \
+		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \
+		-L${ROKENOBJDIR} -lroken -lcom_err \
 		-lcrypt ${MINUSLPAM}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index b8c1792b7096..03c0fa903bd5 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -17,7 +17,8 @@ DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
 		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
 		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
 LDADD=		-ltermcap ${LIBTELNET} -lmp \
-		-lkrb5 -lasn1 -lcom_err -lroken \
+		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \
+		-L${ROKENOBJDIR} -lroken \
 		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>
diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile
index fa8fd9d98a4d..a3f8dd42f1ef 100644
--- a/kerberosIV/usr.bin/telnet/Makefile
+++ b/kerberosIV/usr.bin/telnet/Makefile
@@ -17,7 +17,7 @@ DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
 		${LIBKRB} ${LIBCOM_ERR} \
 		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
 LDADD=		-ltermcap ${LIBTELNET} -lmp \
-		-lkrb -lcom_err \
+		-L${KRBOBJDIR} -lkrb -lcom_err \
 		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>