diff options
| author | jlam <jlam> | 2006-06-06 19:49:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-06-06 19:49:52 +0000 |
| commit | 1697952f397cb9c5eeb312712488d0dec8ea1f1f (patch) | |
| tree | 99960ae71821d07307102824d13378453ae578b9 /mk/flavor | |
| parent | a3af30a2dcdf1d58bde6972a62be6c37d9d73a5d (diff) | |
| download | pkgsrc-1697952f397cb9c5eeb312712488d0dec8ea1f1f.tar.gz | |
Avoid using PKGNAME in target names since they are "immediately"
resolved in much the same manner as variables set using :=. PKGNAME
could be set after including bsd.pkg.mk (which is poor form), and it's
too close to the pkgsrc-2006Q2 branch to fix that all over pkgsrc at
this time). This fixes building shells/static-bash2.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/install.mk | 5 | ||||
| -rw-r--r-- | mk/flavor/pkg/metadata.mk | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk index 6ecad232097..0a90bb034bc 100644 --- a/mk/flavor/pkg/install.mk +++ b/mk/flavor/pkg/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.2 2006/06/05 22:49:44 jlam Exp $ +# $NetBSD: install.mk,v 1.3 2006/06/06 19:49:52 jlam Exp $ ###################################################################### ### install-check-conflicts (PRIVATE, pkgsrc/mk/install/install.mk) @@ -67,7 +67,8 @@ _REGISTER_DEPENDENCIES= \ register-pkg: generate-metadata ${_DEPENDS_COOKIE} @${PHASE_MSG} "Registering installation for ${PKGNAME}" ${_PKG_SILENT}${_PKG_DEBUG}${RM} -fr ${_PKG_DBDIR}/${PKGNAME} - ${_PKG_SILENT}${_PKG_DEBUG}${CP} -R ${PKG_DB_TMPDIR} ${_PKG_DBDIR} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PKG_DBDIR}/${PKGNAME} + ${_PKG_SILENT}${_PKG_DEBUG}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME} ${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} add ${PKGNAME} ${_PKG_SILENT}${_PKG_DEBUG} \ case ${_AUTOMATIC:Q}"" in \ diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk index 4ac6575a179..3a65c90408f 100644 --- a/mk/flavor/pkg/metadata.mk +++ b/mk/flavor/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.2 2006/06/05 22:49:44 jlam Exp $ +# $NetBSD: metadata.mk,v 1.3 2006/06/06 19:49:52 jlam Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -9,7 +9,7 @@ ### Temporary package meta-data directory. The contents of this directory ### are copied directly into the real package meta-data directory. ### -PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb/${PKGNAME} +PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb unprivileged-install-hook: ${PKG_DB_TMPDIR} ${PKG_DB_TMPDIR}: |