From 1c9914ea6ebb6ceacb373ad68e8af64319058644 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 6 Jun 2006 19:49:52 +0000 Subject: 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. --- mk/pkginstall/bsd.pkginstall.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk/pkginstall') diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 6b8e1256f8e..b2c48836178 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.5 2006/06/05 22:49:44 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.6 2006/06/06 19:49:52 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -30,7 +30,7 @@ _PKGINSTALL_DIR= ${WRKDIR}/.pkginstall # XXX This should not be duplicated from the install module, but we # XXX need this until pkginstall is refactored. # XXX -PKG_DB_TMPDIR?= ${WRKDIR}/.pkgdb/${PKGNAME} +PKG_DB_TMPDIR?= ${WRKDIR}/.pkgdb # These are the template scripts for the INSTALL/DEINSTALL scripts. # Packages may do additional work in the INSTALL/DEINSTALL scripts by -- cgit v1.2.3