Put on my peril-sensitive sunglasses. Remove any old libraries that

we have just installed a replacement for.  This should solve the problem
of having a stale /usr/lib/libc.so.4 after we put a fresh
/usr/lib/compat/libc.so.4 in its place.

7 files changed, 7 insertions, 0 deletions

diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile
index 07be405..ce1f887 100644
--- a/lib/compat/compat1x/Makefile
+++ b/lib/compat/compat1x/Makefile
@@ -22,6 +22,7 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
diff --git a/lib/compat/compat20/Makefile b/lib/compat/compat20/Makefile
index f416b33..dc2df65 100644
--- a/lib/compat/compat20/Makefile
+++ b/lib/compat/compat20/Makefile
@@ -19,6 +19,7 @@ beforeinstall:
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
diff --git a/lib/compat/compat21/Makefile b/lib/compat/compat21/Makefile
index 652bbb7..7d58eb3 100644
--- a/lib/compat/compat21/Makefile
+++ b/lib/compat/compat21/Makefile
@@ -18,6 +18,7 @@ beforeinstall:
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
diff --git a/lib/compat/compat22/Makefile b/lib/compat/compat22/Makefile
index 94457f3..f919517 100644
--- a/lib/compat/compat22/Makefile
+++ b/lib/compat/compat22/Makefile
@@ -32,6 +32,7 @@ beforeinstall:
 	@${ECHO} "libtermlib.so.2.1 -> libtermcap.so.2.1" ; \
 		cd ${DESTDIR}${LIBCOMPATDIR}/aout ; \
 		ln -sf libtermcap.so.2.1 libtermlib.so.2.1
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
diff --git a/lib/compat/compat3x.i386/Makefile b/lib/compat/compat3x.i386/Makefile
index 425e93f..492a423 100644
--- a/lib/compat/compat3x.i386/Makefile
+++ b/lib/compat/compat3x.i386/Makefile
@@ -22,6 +22,7 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
diff --git a/lib/compat/compat4x.alpha/Makefile b/lib/compat/compat4x.alpha/Makefile
index 29a3fd8..52857f1 100644
--- a/lib/compat/compat4x.alpha/Makefile
+++ b/lib/compat/compat4x.alpha/Makefile
@@ -22,6 +22,7 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
diff --git a/lib/compat/compat4x.i386/Makefile b/lib/compat/compat4x.i386/Makefile
index 29a3fd8..52857f1 100644
--- a/lib/compat/compat4x.i386/Makefile
+++ b/lib/compat/compat4x.i386/Makefile
@@ -22,6 +22,7 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
+	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.