diff options
| author | jlam <jlam> | 2005-11-22 03:38:40 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-11-22 03:38:40 +0000 |
| commit | 679347899251310b035f9ff2bf603b025b535ae9 (patch) | |
| tree | 4c1babc525da7d591b701ee0c045465dd529efe6 /mk/bsd.pkg.mk | |
| parent | 3b6cdd14a3d503545a733dedec1051b1cc0961bd (diff) | |
| download | pkgsrc-679347899251310b035f9ff2bf603b025b535ae9.tar.gz | |
Create PKG_DB_TMPDIR (${WRKDIR}/.pkgdb) in a separate step from creating
${WRKDIR}, and just always create it as part of a "make extract". This
should fix problems where if an old work directory is lying around that
doesn't already have .pkgdb, then a "make reinstall" won't break.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 61e3861a7bb..249b9292e7b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1765 2005/11/20 15:34:33 rillig Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1766 2005/11/22 03:38:40 jlam Exp $ # # This file is in the public domain. # @@ -1626,7 +1626,6 @@ ${WRKDIR}: . endif .endif ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR} .if defined(WRKOBJDIR) . if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once" . if !exists(${LOCKFILE}) @@ -1642,6 +1641,8 @@ ${WRKDIR}: . endif .endif # WRKOBJDIR +${PKG_DB_TMPDIR}: ${WRKDIR} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR} # Configure @@ -2568,7 +2569,7 @@ fetch: .PHONY: extract .if !target(extract) -extract: checksum ${WRKDIR} acquire-extract-lock ${_EXTRACT_COOKIE} release-extract-lock +extract: checksum ${WRKDIR} ${PKG_DB_TMPDIR} acquire-extract-lock ${_EXTRACT_COOKIE} release-extract-lock .endif .PHONY: patch |