summaryrefslogtreecommitdiff
path: root/mk/install
diff options
context:
space:
mode:
authorjlam <jlam>2006-07-07 13:39:52 +0000
committerjlam <jlam>2006-07-07 13:39:52 +0000
commit1c44fe622f3d6837a18c50688aaba9f562a9d261 (patch)
treef65fc45582c297611556f7ab1df2e6daa55983ff /mk/install
parentdaa322993abcdb5770ca3e48f96d5182eda858d8 (diff)
downloadpkgsrc-1c44fe622f3d6837a18c50688aaba9f562a9d261.tar.gz
Make configure, install, and package barrier-aware even if NO_CONFIGURE,
NO_INSTALL, or NO_PACKAGE are defined.
Diffstat (limited to 'mk/install')
-rw-r--r--mk/install/bsd.install.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk
index ecae846f7d4..00aaa557fe1 100644
--- a/mk/install/bsd.install.mk
+++ b/mk/install/bsd.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.6 2006/07/06 22:29:52 jlam Exp $
+# $NetBSD: bsd.install.mk,v 1.7 2006/07/07 13:39:52 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to installing packages.
@@ -26,8 +26,10 @@ _INSTALL_COOKIE= ${WRKDIR}/.install_done
. if exists(${_INSTALL_COOKIE})
install:
@${DO_NADA}
-. else
+. elif exists(${_BARRIER_COOKIE})
install: ${_PKGSRC_BUILD_TARGETS} install-cookie
+. else
+install: barrier
. endif
.endif