From e2413c56ed10b06f4dab3137b65fe60d95cda45d Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 9 May 2001 14:30:49 +0000
Subject: [PATCH] Fixed world breakage in previous commit. -lpam must never be
used directly (except in the definition of MINUSLPAM in bsd.libnames.mk)
since it doesn't give all the libraries necessary for static linkage.
Fixed missing ${LIBPAM} in DPADD.
Fixed some style bugs in DPADD and LDADD.
---
secure/usr.bin/telnet/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index e3a33d986be5..14e4e796afa0 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -9,10 +9,10 @@ CFLAGS+= -DIPSEC -DINET6
SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c
-DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP}
-DPADD+= ${LIBIPSEC}
-LDADD= -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp
-LDADD+= -lipsec -lpam
+DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP} \
+ ${LIBIPSEC} ${LIBPAM}
+LDADD= -ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp \
+ -lipsec ${MINUSLPAM}
.include <bsd.prog.mk>