diff options
| author | jlam <jlam@pkgsrc.org> | 2006-05-21 14:41:29 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-05-21 14:41:29 +0000 |
| commit | f89090ec85b7c720339d1dd9d6029e9d65a1ea39 (patch) | |
| tree | 3999d38030d566da6c8d5197da5ca61fc60a2194 /mk | |
| parent | 555ea417167c59df9d119ca218d514c637c8dd90 (diff) | |
| download | pkgsrc-f89090ec85b7c720339d1dd9d6029e9d65a1ea39.tar.gz | |
Pass PKG_PHASE=install when recursively calling make from within the
real-su-install target so that the {pre,do,post}-install target command
lists will see the correct, fully-expanded definitions of certain
phase-specific variables.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 99be1ab18fc..309de2dcac5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1822 2006/05/10 17:53:34 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1823 2006/05/21 14:41:29 jlam Exp $ # # This file is in the public domain. # @@ -1966,9 +1966,9 @@ real-su-install: ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install-fake-pkg .endif # !NO_PKG_REGISTER ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install-script - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-install - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install PKG_PHASE=install + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-install PKG_PHASE=install + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install PKG_PHASE=install ${_PKG_SILENT}${DO_NADA} \ # \ # PLIST must be generated at this late point (instead of \ |