5 files changed, 22 insertions, 10 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index ffe3926f4d83..2e5e48658f08 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -163,7 +163,7 @@ beforedepend: ${DHDRS}
 beforebuild: ${DHDRS}
 .endif
 
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
 .include <meta.autodep.mk>
 # this depend: bypasses that below
 # the dependency helps when bootstrapping
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index f9b9e979c2a6..ec2585f16412 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -49,7 +49,7 @@ STANDALONE_SUBDIR_TARGETS?= obj checkdpadd clean cleandepend cleandir \
 .include <bsd.init.mk>
 
 .if !defined(NEED_SUBDIR)
-.if ${.MAKE.LEVEL} == 0 && ${MK_META_MODE} == "yes" && !empty(SUBDIR) && !(make(clean*) || make(destroy*))
+.if ${.MAKE.LEVEL} == 0 && ${MK_DIRDEPS_BUILD} == "yes" && !empty(SUBDIR) && !(make(clean*) || make(destroy*))
 .include <meta.subdir.mk>
 # ignore this
 _SUBDIR:
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index 87e9f0174529..230850cf6606 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -2,7 +2,7 @@
 
 # local configuration specific to meta mode
 # XXX some of this should be in meta.sys.mk
-# we assume that MK_META_MODE=yes
+# we assume that MK_DIRDEPS_BUILD=yes
 
 # we need this until there is an alternative
 MK_INSTALL_AS_USER= yes
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index d542f8b5de97..7022dad40891 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
 MAKE_PRINT_VAR_ON_ERROR+= \
 	.CURDIR \
 	.MAKE \
@@ -23,3 +23,15 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH
 .endif
 
 .include "src.sys.mk"
+
+.if ${.MAKE.MODE:Unormal:Mmeta*} != ""
+# we can afford to use cookies to prevent some targets
+# re-running needlessly
+META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}}
+# some targets need to be .PHONY - but not in meta mode
+META_NOPHONY=
+.else
+META_COOKIE_TOUCH=
+META_NOPHONY= .PHONY
+.endif
+
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index ee0797e743df..4ec1a6b8adab 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -20,14 +20,14 @@ MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm
 # Some options we need now
 __DEFAULT_NO_OPTIONS= \
 	DIRDEPS_CACHE \
+	DIRDEPS_BUILD \
 	META_MODE \
-	META_FILES \
 
 
 __DEFAULT_DEPENDENT_OPTIONS= \
-	AUTO_OBJ/META_MODE \
-	STAGING/META_MODE \
-	SYSROOT/META_MODE
+	AUTO_OBJ/DIRDEPS_BUILD \
+	STAGING/DIRDEPS_BUILD \
+	SYSROOT/DIRDEPS_BUILD
 
 __ENV_ONLY_OPTIONS:= \
 	${__DEFAULT_NO_OPTIONS} \
@@ -43,9 +43,9 @@ __ENV_ONLY_OPTIONS:= \
 
 .include <bsd.mkopt.mk>
 
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
 .sinclude <meta.sys.mk>
-.elif ${MK_META_FILES} == "yes" && defined(.MAKEFLAGS)
+.elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS)
 .if ${.MAKEFLAGS:M-B} == ""
 .MAKE.MODE= meta verbose
 .endif