Replace my stale-lib cleanup with a better one. (less noisy)

Submitted by: ru

7 files changed, 35 insertions, 7 deletions

diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile
index ce1f8871444d..15cb674a71af 100644
--- a/lib/compat/compat1x/Makefile
+++ b/lib/compat/compat1x/Makefile
@@ -22,7 +22,11 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
-	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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 dc2df65ab3fb..4a4c3566cd01 100644
--- a/lib/compat/compat20/Makefile
+++ b/lib/compat/compat20/Makefile
@@ -19,7 +19,11 @@ beforeinstall:
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
-	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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 7d58eb34f06b..d56aa88288ad 100644
--- a/lib/compat/compat21/Makefile
+++ b/lib/compat/compat21/Makefile
@@ -18,7 +18,11 @@ beforeinstall:
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
-	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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 f919517c476e..404a30cdf747 100644
--- a/lib/compat/compat22/Makefile
+++ b/lib/compat/compat22/Makefile
@@ -32,7 +32,11 @@ 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}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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 492a423d8f34..ee650a292d89 100644
--- a/lib/compat/compat3x.i386/Makefile
+++ b/lib/compat/compat3x.i386/Makefile
@@ -22,7 +22,11 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
-	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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 52857f16930e..c01909aaf183 100644
--- a/lib/compat/compat4x.alpha/Makefile
+++ b/lib/compat/compat4x.alpha/Makefile
@@ -22,7 +22,11 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
-	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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 52857f16930e..c01909aaf183 100644
--- a/lib/compat/compat4x.i386/Makefile
+++ b/lib/compat/compat4x.i386/Makefile
@@ -22,7 +22,11 @@ ${lib}:	${lib}.gz.uu
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
-	rm -f ${LIBS:S@^@${DESTDIR}${SHLIBDIR}/@}
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
 
 # 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.