diff options
| author | mycroft <mycroft> | 2000-06-03 19:20:55 +0000 |
|---|---|---|
| committer | mycroft <mycroft> | 2000-06-03 19:20:55 +0000 |
| commit | 8883ad8384d4e94953641b3d7cbe774777356ca8 (patch) | |
| tree | fba06e86b5a6472dcdde579af7ca48b28d3f6df2 /mk | |
| parent | e2131f27784a40f2f26f6e8a5b8a6ddb76ac35b9 (diff) | |
| download | pkgsrc-8883ad8384d4e94953641b3d7cbe774777356ca8.tar.gz | |
Clean up `make clean' a little. In particular, make it safe with WRKOBJDIR
when doing a simultaneous build on another platform.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index db0ed7a5d8b..b106d46742e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.462 2000/06/03 19:12:17 mycroft Exp $ +# $NetBSD: bsd.pkg.mk,v 1.463 2000/06/03 19:20:55 mycroft Exp $ # # This file is in the public domain. # @@ -1958,21 +1958,23 @@ clean: pre-clean .endif @${ECHO_MSG} "${_PKGSRC_IN}> Cleaning for ${PKGNAME}" .if !defined(NO_WRKDIR) -.ifdef WRKOBJDIR - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -rf ${WRKOBJDIR}/${PKGPATH} - -${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR_BASENAME} -.else # WRKOBJDIR - ${_PKG_SILENT}${_PKG_DEBUG}if [ -d ${WRKDIR} ]; then \ + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ ${RM} -rf ${WRKDIR}; \ else \ ${ECHO_MSG} "${_PKGSRC_IN}> ${WRKDIR} not writable, skipping"; \ fi; \ fi +.ifdef WRKOBJDIR + -${_PKG_SILENT}${_PKG_DEBUG} \ + ${RMDIR} ${BUILD_DIR}; \ + ${RM} -f ${WRKDIR_BASENAME} .endif .else - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR}/.*_done SizeAll \ - SizePkg .build_info .build_version .DESCR .PLIST + ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RM} -f ${WRKDIR}/.*_done SizeAll SizePkg .build_info .build_version \ + .DESCR .PLIST .endif .endif |