Author: brooks
Date: Tue Mar 17 18:17:32 2020
New Revision: 359046
URL: https://svnweb.freebsd.org/changeset/base/359046
Log:
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
MFC after: 3 days
Sponsored by: DARPA
Modified:
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Tue Mar 17 17:28:12 2020 (r359045)
+++ head/share/mk/bsd.subdir.mk Tue Mar 17 18:17:32 2020 (r359046)
@@ -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 +++
#
@@ -122,8 +122,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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
