Don't install an elf liby.so[.2] in /usr/lib/compat. We have never had

any elf binaries linked against it.  Try and clean up the mess left over..

1 files changed, 13 insertions, 4 deletions

diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index eebde5e235b6..2cb776ff386e 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1997/02/22 15:08:39 peter Exp $
 
 LIB=		y
 SHLIB_MAJOR=	2
@@ -6,22 +6,31 @@ SHLIB_MINOR=	0
 
 SRCS=	main.c yyerror.c
 
+.if ${OBJFORMAT} != aout
+NOPIC=	true
+.endif
+
 #
 # 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 generatebinaries linked
+# This is so that `ld' will not continue to generate binaries linked
 # shared against liby, so that in a future release we can move this
 # off to a compat dist (like compat22).
 #
 beforeinstall:
-	rm -f ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+	rm -f ${DESTDIR}/usr/lib/compat/lib${LIB}.so \
+	 ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	 ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	 ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR}
 
 .include <bsd.lib.mk>
 
 # This must follow the .include in case SHLIBDIR is defined there.
 ORIG_SHLIBDIR:=	${SHLIBDIR}
 
+.if ${OBJFORMAT} == aout
 # The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR},
 # so neither does this.
-SHLIBDIR=	/usr/lib/compat
+SHLIBDIR=	/usr/lib/compat/aout
+.endif