Don't install an elf libgnumalloc.so* in /usr/lib/compat.. No elf binaries

have been linked against it.  Try and clean up the leftovers.  Also, put
the a.out libs in /usr/lib/compat/aout since that's where the default
a.out ldconfig compat path points to.

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile
index 9d30fa2..f7f8b0d 100644
--- a/lib/libgnumalloc/Makefile
+++ b/lib/libgnumalloc/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.12 1997/02/22 15:06:55 peter Exp $
 
 LIB=		gnumalloc
 INTERNALLIB=	yes		# Do not build or install ${LIB}*.a
@@ -7,6 +7,10 @@ SHLIB_MINOR=	0
 
 SRCS=	cfree.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
@@ -17,8 +21,11 @@ SRCS=	cfree.c
 #
 beforeinstall:
 	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.a \
-	  ${DESTDIR}${LIBDIR}/lib${LIB}_p.a \
-	  ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+	 ${DESTDIR}${LIBDIR}/lib${LIB}_p.a \
+	 ${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} \
+	 ${DESTDIR}/usr/lib/compat/lib${LIB}.so \
 
 .include <bsd.lib.mk>
 
@@ -27,4 +34,4 @@ ORIG_SHLIBDIR:=	${SHLIBDIR}
 
 # 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