diff options
author | agc <agc> | 1998-01-22 11:27:54 +0000 |
---|---|---|
committer | agc <agc> | 1998-01-22 11:27:54 +0000 |
commit | b51ea89fb56f7e7742b5fe77fb6e2b1f90ccecfb (patch) | |
tree | 14cdee9cd584e3aa358ac8f07ab3559df0bff8a2 | |
parent | 52512f4ff715087c09d903f48598d6dcffff1825 (diff) | |
download | pkgsrc-b51ea89fb56f7e7742b5fe77fb6e2b1f90ccecfb.tar.gz |
Ignore the return code from rm when removing the ${WRKDIR} symbolic
link, when doing a "make clean" with WRKOBJDIR defined. From Thorsten
Frueauf.
-rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
-rw-r--r-- | mk/bsd.port.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6b3c5daaed7..bcd362a169c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.32 1998/01/22 10:20:48 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.33 1998/01/22 11:27:54 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1416,7 +1416,7 @@ clean: pre-clean .if !defined(NO_WRKDIR) .if defined(WRKOBJDIR) @${RM} -rf ${WRKOBJDIR}/${PORTSUBDIR} - @${RM} ${WRKDIR} + @${RM} -f ${WRKDIR} .else @if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index c0d0b10440f..296f2ebcc7c 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.32 1998/01/22 10:20:48 agc Exp $ +# $NetBSD: bsd.port.mk,v 1.33 1998/01/22 11:27:54 agc Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1416,7 +1416,7 @@ clean: pre-clean .if !defined(NO_WRKDIR) .if defined(WRKOBJDIR) @${RM} -rf ${WRKOBJDIR}/${PORTSUBDIR} - @${RM} ${WRKDIR} + @${RM} -f ${WRKDIR} .else @if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ |