diff options
| author | dmcmahill <dmcmahill> | 2010-02-27 03:37:58 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2010-02-27 03:37:58 +0000 |
| commit | 20c2eb3fda02e23a39999150fc511b59ec8e4dca (patch) | |
| tree | d2e25b40931ac4308e5999f67d0afa2ac5bd1b98 /mk/bulk | |
| parent | 3564656c77b0e4e2fdd77052385f824686550c6c (diff) | |
| download | pkgsrc-20c2eb3fda02e23a39999150fc511b59ec8e4dca.tar.gz | |
Repair this file after the bulk-packge target was broken by DESTDIR support.
The problem is that bulk-package assumed that the package would be installed
as well as built. When doing DESTDIR builds, make sure we still install
the built packages.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 4cf2e0cdafd..346a82e32ea 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.149 2008/02/07 21:36:13 rillig Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.150 2010/02/27 03:37:58 dmcmahill Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -89,6 +89,11 @@ BULK_ID?= .${MACHINE_ARCH} BULK_ID?= .endif +.if ${_USE_DESTDIR} != "no" +_PACKAGE_TARGET= package package-install +.else +_PACKAGE_TARGET= package +.endif # # Package-specific files # @@ -432,7 +437,7 @@ bulk-package: done ;\ fi ;\ ${ECHO_MSG} ${MAKE} package '(${PKGNAME})' 2>&1 ; \ - ${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} package; \ + ${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} ${_PACKAGE_TARGET};\ ${ECHO} ""; \ ${ECHO} "===> Warnings from the wrapper log (sorted):"; \ ${GREP} "^WARNING" ${WRKLOG} | ${SORT} -u | ${TO_HTML}; \ |