Move setting of the MK_xxx variables based on NO_xxx to avoid
triggering the "you aren't allowed to set this" warning when building stand alone in directories whose Makefile sets NO_MAN, for example.
This commit is contained in:
parent
bcca5958db
commit
14a7e8f167
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=264045
@ -218,21 +218,6 @@ COMPRESS_EXT?= .gz
|
||||
# The NO_* variables should only be set by makefiles.
|
||||
#
|
||||
|
||||
#
|
||||
# Supported NO_* options (if defined, MK_* will be forced to "no",
|
||||
# regardless of user's setting).
|
||||
#
|
||||
.for var in \
|
||||
CTF \
|
||||
DEBUG_FILES \
|
||||
INSTALLLIB \
|
||||
MAN \
|
||||
PROFILE
|
||||
.if defined(NO_${var})
|
||||
MK_${var}:=no
|
||||
.endif
|
||||
.endfor
|
||||
|
||||
#
|
||||
# Older-style variables that enabled behaviour when set.
|
||||
#
|
||||
@ -466,6 +451,22 @@ MK_${var}:= no
|
||||
.endfor
|
||||
.undef __DEFAULT_NO_OPTIONS
|
||||
|
||||
|
||||
#
|
||||
# Supported NO_* options (if defined, MK_* will be forced to "no",
|
||||
# regardless of user's setting).
|
||||
#
|
||||
.for var in \
|
||||
CTF \
|
||||
DEBUG_FILES \
|
||||
INSTALLLIB \
|
||||
MAN \
|
||||
PROFILE
|
||||
.if defined(NO_${var})
|
||||
MK_${var}:=no
|
||||
.endif
|
||||
.endfor
|
||||
|
||||
#
|
||||
# Force some options off if their dependencies are off.
|
||||
# Order is somewhat important.
|
||||
|
Loading…
Reference in New Issue
Block a user