cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"poison" passing SUBDIR/SUBDIRLIST on the command line. It should be

Browse Source 
in the environment like FLAVOR, SUBPACKAGE, as it needs to be unset in
recursion.

(fixed known users first. If I missed any, fix is easy)
This commit is contained in:
espie 2020-02-26 15:32:45 +00:00
parent f06a675c92
commit 5c6d5dbbc6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1518 2020/02/20 16:48:03 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1519 2020/02/26 15:32:45 espie Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -46,12 +46,11 @@
#
# tests and variable definitions come first, THEN targets
#
.if ${.MAKEFLAGS:MFLAVOR=*}
ERRORS += "Fatal: Use 'env FLAVOR=${FLAVOR} ${MAKE}' instead."
.endif
.if ${.MAKEFLAGS:MSUBPACKAGE=*}
ERRORS += "Fatal: Use 'env SUBPACKAGE=${SUBPACKAGE} ${MAKE}' instead."
.endif
.for forbidden in FLAVOR SUBPACKAGE SUBDIR SUBDIRLIST
. if ${.MAKEFLAGS:M${forbidden}=*}
ERRORS += "Fatal: Use 'env ${forbidden}=${${forbidden}} ${MAKE}' instead."
. endif
.endfor
.for f v in bsd.port.mk _BSD_PORT_MK bsd.port.subdir.mk _BSD_PORT_SUBDIR_MK
. if defined($v)