move error handling later for greater flexibility.

Move default NO_* after including local Makefiles.
This commit is contained in:
espie 2001-10-03 08:41:16 +00:00
parent c202780cad
commit 548eff5cee

View File

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.466 2001/10/03 08:36:25 espie Exp $$
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.467 2001/10/03 08:41:16 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 $
#
@ -273,9 +273,6 @@ clean+=-f
NOMANCOMPRESS?= Yes
DEF_UMASK?= 022
NO_DEPENDS?= No
NO_BUILD?= No
.if exists(${.CURDIR}/Makefile.${ARCH})
.include "${.CURDIR}/Makefile.${ARCH}"
.else
@ -284,6 +281,9 @@ NO_BUILD?= No
.endif
.endif
NO_DEPENDS?= No
NO_BUILD?= No
# These need to be absolute since we don't know how deep in the ports
# tree we are and thus can't go relative. They can, of course, be overridden
# by individual Makefiles or local system make configuration.
@ -1064,16 +1064,6 @@ _CATPAGES+= ${CAT${sect}:S%^%${CAT${sect}PREFIX}/man/${lang}/cat${sect:L}/%}
. endfor
.endfor
.if defined(ERRORS)
.BEGIN:
. for _m in ${ERRORS}
@echo 1>&2 ${_m}
. endfor
. if !empty(ERRORS:M"Fatal\:*")
@exit 1
. endif
.endif
################################################################
# Many ways to disable a port.
#
@ -2585,6 +2575,16 @@ unlink-categories:
. include "${PORTSDIR}/infrastructure/mk/old-install.mk"
.endif
.if defined(ERRORS)
.BEGIN:
. for _m in ${ERRORS}
@echo 1>&2 ${_m}
. endfor
. if !empty(ERRORS:M"Fatal\:*")
@exit 1
. endif
.endif
.PHONY: \
addsum all build build-depends checkpatch \
checksum clean clean-depends configure deinstall \