From 634ea54e4460523588a80a5567aba6b391066876 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Fri, 4 Aug 2006 06:27:27 +0000
Subject: In the "makedirs" target, it is clear that the lock file is always
 the _WRKDIR_LOCKFILE and never _PREFIX_LOCKFILE, so use that to keep things
 simple.

Replaced ECHO with ECHO_MSG in the message for creating the WRKDIR
symlink.
---
 mk/bsd.pkg.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 2088fff4d85..0a80248ee1d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1881 2006/08/04 05:55:18 rillig Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1882 2006/08/04 06:27:27 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -614,8 +614,7 @@ ${WRKDIR}:
 .if !defined(KEEP_WRKDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${_GET_LOCKFILE_CMD};						\
-	${TEST} -f "$$lockfile" || ${RM} -fr ${WRKDIR}
+	${TEST} -f ${_WRKDIR_LOCKFILE} || ${RM} -fr ${WRKDIR}
 .  endif
 .endif
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
@@ -630,12 +629,11 @@ makedirs: ${.CURDIR}/${WRKDIR_BASENAME}
  ${.CURDIR}/${WRKDIR_BASENAME}:
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${_GET_LOCKFILE_CMD};						\
-	${TEST} -f "$$lockfile" || ${RM} -f ${.TARGET}
+	${TEST} -f ${_WRKDIR_LOCKFILE} || ${RM} -f ${.TARGET}
 .  endif
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${LN} -s ${WRKDIR} ${.TARGET} 2>/dev/null; then		\
-		${ECHO} "${.TARGET:T} -> ${WRKDIR}";			\
+		${ECHO_MSG} "${.TARGET:T} -> ${WRKDIR}";		\
 	fi
 .endif
 
-- 
cgit v1.2.3