diff options
| author | agc <agc@pkgsrc.org> | 2001-01-15 19:46:29 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-01-15 19:46:29 +0000 |
| commit | e9f4c3ed7de995ebf815a4c77eede8423a7a517f (patch) | |
| tree | cf9c2878560463cbdc8649703c357dc93e9897c9 | |
| parent | 563d5baa036b41a4bcb52bfb26106e209402931e (diff) | |
| download | pkgsrc-e9f4c3ed7de995ebf815a4c77eede8423a7a517f.tar.gz | |
Remove NO_WRKDIR, which is incompatible with read-only pkgsrc, and not used
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fffafca0263..828f287d657 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.642 2001/01/13 18:35:09 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.643 2001/01/15 19:46:29 agc Exp $ # # This file is in the public domain. # @@ -422,11 +422,7 @@ WRKDIR_BASENAME?= work.${MACHINE_ARCH} WRKDIR_BASENAME?= work .endif -.ifdef NO_WRKDIR -WRKDIR?= ${BUILD_DIR} -.else WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME} -.endif # !NO_WRKDIR .if defined(NO_WRKSUBDIR) WRKSRC?= ${WRKDIR} @@ -1365,7 +1361,6 @@ DOWNLOADED_DISTFILE= ${_DISTDIR}/$$file .if !target(do-extract) do-extract: -.ifndef NO_WRKDIR .ifndef KEEP_WRKDIR ${_PKG_SILENT}${_PKG_DEBUG}${RM} -rf ${WRKDIR} .endif @@ -1377,7 +1372,6 @@ do-extract: ${ECHO} "${WRKDIR_BASENAME} -> ${WRKDIR}"; \ fi .endif # WRKOBJDIR -.endif ${_PKG_SILENT}${_PKG_DEBUG} \ for file in "" ${EXTRACT_ONLY}; do \ if [ "X$$file" = X"" ]; then continue; fi; \ @@ -2237,7 +2231,6 @@ clean: pre-clean ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} clean-depends .endif @${ECHO_MSG} "${_PKGSRC_IN}> Cleaning for ${PKGNAME}" -.if !defined(NO_WRKDIR) ${_PKG_SILENT}${_PKG_DEBUG} \ if [ -d ${WRKDIR} ]; then \ if [ -w ${WRKDIR} ]; then \ @@ -2251,12 +2244,6 @@ clean: pre-clean ${RMDIR} ${BUILD_DIR} 2>/dev/null; \ ${RM} -f ${WRKDIR_BASENAME} .endif -.else - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${RM} -f ${WRKDIR}/.*_done ${SIZE_PKG_FILE} ${SIZE_ALL_FILE} \ - ${BUILD_VERSION_FILE} ${BUILD_INFO_FILE} ${DESCR} \ - ${PLIST} -.endif .endif |