Style clean-up, and diff-reduce WRT src/secure/*telnet*/Makefile

Lost in this commit - KerberosIV compatability. This will be
re-added later.

1 files changed, 13 insertions, 13 deletions

diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index 7dab16f..f119212 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -8,28 +8,28 @@ NOPIC=		yes
 
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
-.if defined(MAKE_KERBEROS4)
-SRCS+=		kerberos.c
-CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
-.endif
+SRCS+=		kerberos5.c
 
-#SRCS+=		kerberos5.c
+#WARNS?=		2
 
-CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-		-DSRA -I${TELNETDIR}
-#CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
+CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
+CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
 
 INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa
 
+.include <bsd.lib.mk>
+
+.PATH:	${TELNETDIR}/libtelnet
+
 #
 # Remove obsolete shared libraries, if any.  We don't bother moving them
 # to /usr/lib/compat, since they were only used by telnet, telnetd and
 # tn3270.
 #
-beforeinstall:
+beforeinstall: __remove-stale-libs
+__remove-stale-libs: .PHONY
+.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
+	-chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
 	rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-
-.include <bsd.lib.mk>
-
-.PATH:	${TELNETDIR}/libtelnet
+.endif