From 844939d7431687de13bd2bd927fdfbd56aa6e9e1 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 17 Jan 2020 14:29:27 +0000 Subject: [PATCH] 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 --- share/mk/src.sys.env.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk index 6f8dcbf22c1c..6f11489bfd2f 100644 --- a/share/mk/src.sys.env.mk +++ b/share/mk/src.sys.env.mk @@ -61,8 +61,9 @@ MAKEOBJDIRPREFIX:= ${_saveMAKEOBJDIRPREFIX} .include # 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