diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-04-05 08:06:07 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-04-05 08:06:07 +0000 |
| commit | 6e02e094890953ee9b092a9cea355525c287153a (patch) | |
| tree | 056ceee11b133ca9b3c7685c6172fdb83c837907 | |
| parent | 25009b9fdb60538d45917185119b54920739d36d (diff) | |
| download | pkgsrc-6e02e094890953ee9b092a9cea355525c287153a.tar.gz | |
Support DEPENDS_TARGET="install clean"; from Allan Barrett in
PR pkg/25059.
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d102e5731bb..64cf34504c7 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1436 2004/04/03 06:22:39 reed Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1437 2004/04/05 08:06:07 xtraeme Exp $ # # This file is in the public domain. # @@ -3216,7 +3216,7 @@ ${EXTRACT_COOKIE}: @${TOUCH} ${INTERACTIVE_COOKIE} @${FALSE} .else - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-extract DEPENDS_TARGET=${DEPENDS_TARGET} PKG_PHASE=extract + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-extract DEPENDS_TARGET=${DEPENDS_TARGET:Q} PKG_PHASE=extract .endif ${PATCH_COOKIE}: @@ -3415,7 +3415,7 @@ post-${name}: .if !target(reinstall) reinstall: ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} ${PLIST} - ${_PKG_SILENT}${_PKG_DEBUG}DEPENDS_TARGET=${DEPENDS_TARGET} ${MAKE} ${MAKEFLAGS} install + ${_PKG_SILENT}${_PKG_DEBUG}DEPENDS_TARGET=${DEPENDS_TARGET:Q} ${MAKE} ${MAKEFLAGS} install .endif # Deinstall @@ -3508,7 +3508,7 @@ update: .endif ${_PKG_SILENT}${_PKG_DEBUG} \ ${MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} KEEP_WRKDIR=YES \ - DEPENDS_TARGET=${DEPENDS_TARGET} + DEPENDS_TARGET=${DEPENDS_TARGET:Q} ${_PKG_SILENT}${_PKG_DEBUG} \ [ ! -s ${DDIR} ] || for dep in `${CAT} ${DDIR}` ; do \ (if cd ../.. && cd "$${dep}" ; then \ @@ -3519,7 +3519,7 @@ update: ${MAKE} ${MAKEFLAGS} deinstall; \ fi && \ ${MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} \ - DEPENDS_TARGET=${DEPENDS_TARGET} ; \ + DEPENDS_TARGET=${DEPENDS_TARGET:Q} ; \ else \ ${ECHO_MSG} "${_PKGSRC_IN}> Skipping removed directory $${dep}"; \ fi) ; \ @@ -4038,7 +4038,7 @@ real-su-bin-install: ${SHCOMMENT} Cycle through some FTP server here ;\ ${ECHO_MSG} "Installing from source" ; \ ${MAKE} ${MAKEFLAGS} package \ - DEPENDS_TARGET=${DEPENDS_TARGET} && \ + DEPENDS_TARGET=${DEPENDS_TARGET:Q} && \ ${MAKE} ${MAKEFLAGS} clean ; \ fi ; \ fi @@ -4171,7 +4171,7 @@ install-depends: uptodate-pkgtools ${ECHO_MSG} "${_PKGSRC_IN}> Required installed package $$pkg: $${found} found"; \ else \ ${ECHO_MSG} "${_PKGSRC_IN}> Required package $$pkg: NOT found"; \ - target=${DEPENDS_TARGET}; \ + target=${DEPENDS_TARGET:Q}; \ ${ECHO_MSG} "${_PKGSRC_IN}> Verifying $$target for $$dir"; \ if [ ! -d $$dir ]; then \ ${ECHO_MSG} "=> No directory for $$dir. Skipping.."; \ |