set _MASTER_LOCK in the correct location.

fix postgresql locking *for good*.
okay pvalchev@
This commit is contained in:
espie 2004-08-12 19:02:45 +00:00
parent b2fffcb71e
commit 9560823362

View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.640 2004/08/11 22:42:47 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.641 2004/08/12 19:02:45 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -1290,12 +1290,13 @@ ${WRKDIR}/.${_DEP}${_i:C,[|:./<=>*],-,g}: ${_WRKDIR_COOKIE}
IFS=:; read dep pkg dir target; \
${_flavor_fragment}; defaulted=false; \
case "X$$target" in X) target=${DEPENDS_TARGET};; esac; \
toset="$$toset _MASTER_LOCK=${_LOCKNAME}"; \
case "X$$target" in \
Xinstall|Xreinstall) early_exit=false;; \
Xpackage) early_exit=true;; \
*) \
early_exit=true; mkdir -p ${WRKDIR}/$$dir; \
toset="$$toset _MASTER='[${FULLPKGNAME${SUBPACKAGE}}]${_MASTER}' _MASTER_LOCK=${_LOCKNAME} WRKDIR=${WRKDIR}/$$dir"; \
toset="$$toset _MASTER='[${FULLPKGNAME${SUBPACKAGE}}]${_MASTER}' WRKDIR=${WRKDIR}/$$dir"; \
dep="/nonexistent";; \
esac; \
case "X$$pkg" in X) pkg=`eval $$toset ${MAKE} _print-packagename`; \