Sense MAKE_EBONES, DESTDIR

SRCS cleanup
DPADD cleanup

1 files changed, 22 insertions, 15 deletions

diff --git a/eBones/lib/libtelnet/Makefile b/eBones/lib/libtelnet/Makefile
index 013f3be..5bfc944 100644
--- a/eBones/lib/libtelnet/Makefile
+++ b/eBones/lib/libtelnet/Makefile
@@ -1,31 +1,38 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $
+#	$Id: Makefile,v 1.11 1995/10/11 00:03:59 gibbs Exp $
 
 LIB=	telnet
-SRCS=   auth.c encrypt.c genget.c getent.c misc.c
-SRCS+=  enc_des.c
-SRCS+=	spx.c rsaencpwd.c read_password.c
+SRCS=   encrypt.c genget.c getent.c misc.c
 CFLAGS+= -DHAS_CGETENT
 
 #ifdef	ENCRYPTION
 
-CFLAGS+= -DENCRYPTION -DAUTHENTICATION
+CFLAGS+= -DENCRYPTION
 
-.if exists(/usr/lib/libkrb.a)
-CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
+	|| defined(MAKE_KERBEROS))
+CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
 # KRB4_ENCPWD not yet defined
 #CFLAGS+= -DKRB4_ENCPWD
-SRCS+=  kerberos.c
+SRCS+=  auth.c kerberos.c enc_des.c
 # KRB4_ENCPWD not yet defined
-#SRCS+=   krb4encpwd.c
-LDADD+= -ldes -lkrb
+#SRCS+=   krb4encpwd.c read_password.c
+LDADD+= -des -lkrb
+DPADD+= ${LIBDES} ${LIBKRB}
 .endif
 
-.if exists(/usr/lib/libkrb5.a)
-CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION
-SRCS+=	kerberos5.c forward.c
-LDADD+= -ldes -lkrb5
-.endif
+#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
+#        || defined(MAKE_KERBEROS))
+#CFLAGS+= -DDES_ENCRYPTION -DAUTHENTICATION
+#CFLAGS+= -DKRB5 -DFORWARD
+#SRCS+=  auth.c kerberos5.c forward.c enc_des.c
+#LDADD+= -ldes -lkrb5
+#DPADD+= ${LIBDES}
+#.endif
+
+# Not Yet
+#SRCS += spx.c rsaencpwd.c read_password.c
 
 # Used only in krb4encpwd.c and rsaencpwd.c, not yet active
 #LDADD+= -ldescrypt