From e032d3f96bf923ac91c9e8f17449634a2f81bf02 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Sat, 27 Feb 2010 03:37:58 +0000 Subject: 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. --- mk/bulk/bsd.bulk-pkg.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'mk/bulk') 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 @@ -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}; \ -- cgit v1.2.3