[src/netbsd-2-0]: src Pull up revision 1.18 (requested by jmc in ticket #531):

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/118b2560cb0c
branches:  netbsd-2-0
changeset: 561561:118b2560cb0c
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:55:44 2004 +0000

description:
Pull up revision 1.18 (requested by jmc in ticket #531):
Ignore errors on some rm -rf's for platforms that aren't quite
POSIX compliant
and return errors on r/o source (FreeBSD) for -rf. Fixes PR#25022

diffstat:

 distrib/acorn32/stand/Makefile   |  8 ++++----
 gnu/usr.bin/binutils/ld/Makefile |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 7455d9ae3eba -r 118b2560cb0c distrib/acorn32/stand/Makefile
--- a/distrib/acorn32/stand/Makefile    Tue Jun 22 07:55:23 2004 +0000
+++ b/distrib/acorn32/stand/Makefile    Tue Jun 22 07:55:44 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10.2.7 2004/06/17 08:37:46 tron Exp $
+#      $NetBSD: Makefile,v 1.10.2.8 2004/06/22 07:55:44 tron Exp $
 #
 
 .include <bsd.own.mk>
@@ -88,10 +88,10 @@
 
 .PHONY: setup_tmp
 setup_tmp:
-       rm -rf tmp
+       -rm -rf tmp
        mkdir tmp
        cp -R ${.CURDIR}/BtNetBSD tmp/
-       find tmp -path '*/CVS/*' -type f -exec rm -rf {} \;
+       -find tmp -path '*/CVS/*' -type f -exec rm -rf {} \;
        find tmp -name CVS -type d | xargs rmdir
        find tmp -name '*.uue' -type f -exec rm -f {} \;
 
@@ -113,7 +113,7 @@
 
 localclean:
        rm -f ${ARCHIVE}
-       if [ -d tmp ]; then rm -rf tmp; fi
+       -if [ -d tmp ]; then rm -rf tmp; fi
 
 .include <bsd.files.mk>
 .include <bsd.prog.mk>
diff -r 7455d9ae3eba -r 118b2560cb0c gnu/usr.bin/binutils/ld/Makefile
--- a/gnu/usr.bin/binutils/ld/Makefile  Tue Jun 22 07:55:23 2004 +0000
+++ b/gnu/usr.bin/binutils/ld/Makefile  Tue Jun 22 07:55:44 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2003/12/04 09:29:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.17.2.1 2004/06/22 07:55:44 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -92,4 +92,4 @@
 
 cleanprog: __cleanldscripts 
 __cleanldscripts:
-       rm -rf ldscripts
+       -rm -rf ldscripts