kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Repair this file after the bulk-packge target was broken by DESTDIR support.

Browse source 
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.
This commit is contained in:
dmcmahill 2010-02-27 03:37:58 +00:00
parent b7e4c3da10
commit e032d3f96b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mk/bulk/bsd.bulk-pkg.mk
View file

@ -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}; \