svn commit: r359250 - stable/11/share/mk
Brooks Davis
brooks at FreeBSD.org
Mon Mar 23 17:50:01 UTC 2020
Author: brooks
Date: Mon Mar 23 17:50:00 2020
New Revision: 359250
URL: https://svnweb.freebsd.org/changeset/base/359250
Log:
MFC r359046:
Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions.
This allows simplification of Makefiles where some SUBDIR entries depend
on two things (e.g. something that depends on C++ and some other knob).
Discussed with: imp, jhb
Obtained from: CheriBSD
Sponsored by: DARPA
Modified:
stable/11/share/mk/bsd.subdir.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.subdir.mk
==============================================================================
--- stable/11/share/mk/bsd.subdir.mk Mon Mar 23 17:45:31 2020 (r359249)
+++ stable/11/share/mk/bsd.subdir.mk Mon Mar 23 17:50:00 2020 (r359250)
@@ -16,8 +16,8 @@
#
# SUBDIR A list of subdirectories that should be built as well.
# Each of the targets will execute the same target in the
-# subdirectories. SUBDIR.yes is automatically appended
-# to this list.
+# subdirectories. SUBDIR.yes and SUBDIR.yes.yes are
+# automatically appended to this list.
#
# +++ targets +++
#
@@ -113,8 +113,8 @@ install: beforeinstall realinstall afterinstall
# SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD
.if !target(_SUBDIR)
-.if defined(SUBDIR) || defined(SUBDIR.yes)
-SUBDIR:=${SUBDIR} ${SUBDIR.yes}
+.if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes)
+SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes}
SUBDIR:=${SUBDIR:u}
.endif
More information about the svn-src-all
mailing list