summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2006-06-15 02:24:41 +0000
committerjlam <jlam>2006-06-15 02:24:41 +0000
commitd8a80aa4d226ac718c2b9c6f5be9ee3b5b8c8edb (patch)
tree4e89ebeb8fa8d153a9c0ec08a0bab2b7189ab133 /mk
parent248a7f98b19cc51aa6e81c3bf632b53b2567bdb1 (diff)
downloadpkgsrc-d8a80aa4d226ac718c2b9c6f5be9ee3b5b8c8edb.tar.gz
Allow the standard build target to be overridden by the one generated
if PKG_{FAIL,SKIP}_REASON is set. This fixes the behavior when one invokes "make build" in a package that sets a fail or skip reason to stop as soon as the reason is printed.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 2d0c831b6ef..60ccd1a1045 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1851 2006/06/12 16:30:03 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1852 2006/06/15 02:24:41 jlam Exp $
#
# This file is in the public domain.
#
@@ -769,7 +769,7 @@ configure: wrapper
.endif
# Disable build
-.PHONY: build
+.PHONY: _build
.if defined(NO_BUILD)
_build: configure
${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${_BUILD_COOKIE}
@@ -1227,7 +1227,9 @@ _build: configure acquire-build-lock ${_BUILD_COOKIE} release-build-lock
.endif
.PHONY: build
+.if !target(build)
build: pkginstall
+.endif
.PHONY: test
.if !target(test)