diff options
| author | kei <kei> | 2003-02-08 23:27:00 +0000 |
|---|---|---|
| committer | kei <kei> | 2003-02-08 23:27:00 +0000 |
| commit | 2307699e189cc382ebf67cd9acef9536a65230e5 (patch) | |
| tree | 94771272d912cb39b3cabbbb8527f80cafedc868 /mk/bulk | |
| parent | 2a16c35b933eff9664aa54376c21b728760d63df (diff) | |
| download | pkgsrc-2307699e189cc382ebf67cd9acef9536a65230e5.tar.gz | |
honor PKG_SKIP_REASON as well as PKG_FAIL_REASON, like normal build does.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 590fc9c92e4..1989eca64c6 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.41 2002/12/07 02:37:58 schmonz Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.42 2003/02/08 23:27:00 kei Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -324,7 +324,7 @@ bulk-package: if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \ ${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\ pkgerr="-1"; \ - pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && ${MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \ + pkgignore=`(cd ${_PKGSRCDIR}/$$pkgdir && (${MAKE} show-var VARNAME=PKG_FAIL_REASON; ${MAKE} show-var VARNAME=PKG_SKIP_REASON))`; \ if [ ! -z "$$pkgignore" -a ! -f ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE} ]; then \ ${ECHO_MSG} "BULK> $$pkgname ($$pkgdir) may not be packaged because:" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ ${ECHO_MSG} "BULK> $$pkgignore" >> ${_PKGSRCDIR}/$$pkgdir/${BROKENFILE};\ |