svn commit: r319481 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Jun  1 23:04:44 2017
New Revision: 319481
URL: https://svnweb.freebsd.org/changeset/base/319481

Log:
  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.

Modified:
  head/share/mk/local.meta.sys.mk
  head/share/mk/sys.mk

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Thu Jun  1 22:59:41 2017	(r319480)
+++ head/share/mk/local.meta.sys.mk	Thu Jun  1 23:04:44 2017	(r319481)
@@ -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

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Thu Jun  1 22:59:41 2017	(r319480)
+++ head/share/mk/sys.mk	Thu Jun  1 23:04:44 2017	(r319481)
@@ -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