From a9d7016af505fd8f5eada730992ea8244c07a6b1 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 11 Oct 1998 16:33:02 +0000 Subject: [PATCH] Fixed removing of obsolete shared libraries: - the directory was wrong if ${SHLIBDIR} != ${LIBDIR}. It's still wrong if the installation of the obsolete library was done before /aout was appended to LIBDIR. - the version would have become wrong when the default in ../Makefile.inc is changed from 2.0. - the comment mostly described moving of libraries to /usr/lib/compat, but we don't do that. --- lib/libtelnet/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index fa32e6730600..1589b9a2eaf7 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $Id$ +# $Id: Makefile,v 1.8 1998/08/30 13:07:16 markm Exp $ LIB= telnet SRCS= genget.c getent.c misc.c @@ -7,15 +7,12 @@ CFLAGS+= -DHAS_CGETENT NOPIC= true # -# 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. # beforeinstall: - rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} + rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 .include