From owner-svn-src-head@freebsd.org  Thu Jun  1 23:04:45 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DCC8DB82D6C;
 Thu,  1 Jun 2017 23:04:45 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA79C70727;
 Thu,  1 Jun 2017 23:04:45 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v51N4ik3088489;
 Thu, 1 Jun 2017 23:04:44 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v51N4it3088487;
 Thu, 1 Jun 2017 23:04:44 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201706012304.v51N4it3088487@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 1 Jun 2017 23:04:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319481 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2017 23:04:46 -0000

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