svn commit: r356827 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Jan 17 14:29:27 2020
New Revision: 356827
URL: https://svnweb.freebsd.org/changeset/base/356827

Log:
  META_MODE: Allow 'make all install' to work with filemon.
  
  Filemon will add the ability to ignore the cookie if the installed file is
  missing. Without filemon that's not possible though so if the cookie is present
  an the command unchanged then the install wouldn't run.
  
  Sponsored by:	DellEMC
  MFC after:	2 weeks

Modified:
  head/share/mk/src.sys.env.mk

Modified: head/share/mk/src.sys.env.mk
==============================================================================
--- head/share/mk/src.sys.env.mk	Fri Jan 17 06:10:24 2020	(r356826)
+++ head/share/mk/src.sys.env.mk	Fri Jan 17 14:29:27 2020	(r356827)
@@ -61,8 +61,9 @@ MAKEOBJDIRPREFIX:=	${_saveMAKEOBJDIRPREFIX}
 .include <bsd.mkopt.mk>
 
 # Top-level installs should not use meta mode as it may prevent installing
-# based on cookies.
-.if make(*install*) && ${.MAKE.LEVEL} == 0
+# based on cookies. It's fine with filemon though.
+.if !empty(META_MODE:Mnofilemon) && \
+  make(*install*) && ${.MAKE.LEVEL} == 0
 META_MODE=	normal
 MK_META_MODE=	no
 .export MK_META_MODE