Merged src/lib/libtelnet rev.1.9 (fixed removing of obsolete shared

library: wrong library directory, wrong library extension and wrong
comment).  This is mainly of historical interest, if any.  The library
that gets removed is aout.

Also, backout the beforeinstall -> afterinstall change in rev.1.20
that was required to install proper telnet.h into /usr/include/arpa.
The actual problem is in <bsd.lib.mk>, and I am going to fix it.

1 files changed, 5 insertions, 8 deletions

diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 10760d51b871..4ed638a73151 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -16,15 +16,12 @@ INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa
 
 #
-# Before complaining about this, please *double-check* that you have
-# updated the ldconfig path in /etc/rc to include /usr/lib/compat that
-# was added in src/etc/rc rev 1.98.
-# This is so that `ld' will not continue to generate binaries linked
-# shared against libtelnet, so that in a future release we can move this
-# off to a compat dist (like compat22).
+# 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.
 #
-afterinstall:
-	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+beforeinstall:
+	rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
 
 .include <bsd.lib.mk>