From 53b3b05944bcd16f747e4d6937488e9dd2f1229c Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 1 Jun 2017 23:04:44 +0000 Subject: [PATCH] META_MODE: Move ignoring of /usr/local/etc/libmap.d to proper place. This was added in r318194 but local.meta.sys.mk is only used for DIRDEPS_BUILD. --- share/mk/local.meta.sys.mk | 3 --- share/mk/sys.mk | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index 82de954945a..2706683f210 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -283,6 +283,3 @@ META_MODE+= missing-meta=yes .if empty(META_MODE:Mnofilemon) META_MODE+= missing-filemon=yes .endif -# We do not want everything out-of-date just because -# some unrelated shared lib updated this. -.MAKE.META.IGNORE_PATHS+= /usr/local/etc/libmap.d diff --git a/share/mk/sys.mk b/share/mk/sys.mk index c6c54f14aed..cd300e8b7a1 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -91,7 +91,11 @@ META_MODE?= normal /usr/share \ .endif - +.if !empty(.MAKE.MODE:Mmeta) +# We do not want everything out-of-date just because +# some unrelated shared lib updated this. +.MAKE.META.IGNORE_PATHS+= /usr/local/etc/libmap.d +.endif .if ${MK_AUTO_OBJ} == "yes" # This needs to be done early - before .PATH is computed