From owner-svn-src-head@freebsd.org  Sat Jul 28 20:26:26 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71477105D34B;
 Sat, 28 Jul 2018 20:26:26 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1913B7F4D0;
 Sat, 28 Jul 2018 20:26:26 +0000 (UTC) (envelope-from brd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EDF8D3D62;
 Sat, 28 Jul 2018 20:26:25 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6SKQPEF032349;
 Sat, 28 Jul 2018 20:26:25 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SKQPFx032348;
 Sat, 28 Jul 2018 20:26:25 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201807282026.w6SKQPFx032348@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Sat, 28 Jul 2018 20:26:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336841 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 336841
X-SVN-Commit-Repository: base
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.27
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: Sat, 28 Jul 2018 20:26:26 -0000

Author: brd
Date: Sat Jul 28 20:26:25 2018
New Revision: 336841
URL: https://svnweb.freebsd.org/changeset/base/336841

Log:
  Fix `make distribute' installing some configs which means CONFS was broken
  with etcupdate and mergemaster.
  
  Approved by:	bapt (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16478

Modified:
  head/share/mk/bsd.confs.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Sat Jul 28 20:21:23 2018	(r336840)
+++ head/share/mk/bsd.confs.mk	Sat Jul 28 20:26:25 2018	(r336841)
@@ -23,7 +23,6 @@ buildconfig: ${${group}}
 all: buildconfig
 .  endif
 
-.  if !target(installconfig)
 .    for group in ${CONFGROUPS}
 .      if defined(${group}) && !empty(${group})
 
@@ -130,8 +129,6 @@ _${group}INS_${cnf:T}: ${cnf}
 
 .    endif # defined(${group}) && !empty(${group})
 .  endfor
-
-.endif # !target(installconfig)
 
 .if ${MK_STAGING} != "no"
 .  if !empty(STAGE_SETS)