From owner-svn-src-stable@freebsd.org  Wed Jul 31 17:01:25 2019
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 08FB2A3CEB;
 Wed, 31 Jul 2019 17:01:25 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 45zKT065Fqz44KX;
 Wed, 31 Jul 2019 17:01:24 +0000 (UTC)
 (envelope-from brooks@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 B284F4C0E;
 Wed, 31 Jul 2019 17:01:24 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6VH1Ow4068757;
 Wed, 31 Jul 2019 17:01:24 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6VH1OOl068755;
 Wed, 31 Jul 2019 17:01:24 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201907311701.x6VH1OOl068755@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 31 Jul 2019 17:01:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r350469 - in stable/12/libexec/bootpd: . tools
X-SVN-Group: stable-12
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: in stable/12/libexec/bootpd: . tools
X-SVN-Commit-Revision: 350469
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 45zKT065Fqz44KX
X-Spamd-Bar: /
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-0.25 / 15.00];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_SHORT(-0.25)[-0.245,0]
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Jul 2019 17:01:25 -0000

Author: brooks
Date: Wed Jul 31 17:01:23 2019
New Revision: 350469
URL: https://svnweb.freebsd.org/changeset/base/350469

Log:
  MFC r350143, r350148
  
  r350143:
  Chain Makefile.inc's so default are inherited as expected.
  
  Remove unneeded or duplicate variables.
  
  No functional change.
  
  r350148:
  Restore WARNS?=1 here.  I missed that libexec/bootpd/bootpgw existed.
  
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL

Modified:
  stable/12/libexec/bootpd/Makefile.inc
  stable/12/libexec/bootpd/tools/Makefile.inc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/bootpd/Makefile.inc
==============================================================================
--- stable/12/libexec/bootpd/Makefile.inc	Wed Jul 31 16:58:09 2019	(r350468)
+++ stable/12/libexec/bootpd/Makefile.inc	Wed Jul 31 17:01:23 2019	(r350469)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-BINDIR?=	/usr/libexec
-
 WARNS?=		1
+
+.include "../Makefile.inc"

Modified: stable/12/libexec/bootpd/tools/Makefile.inc
==============================================================================
--- stable/12/libexec/bootpd/tools/Makefile.inc	Wed Jul 31 16:58:09 2019	(r350468)
+++ stable/12/libexec/bootpd/tools/Makefile.inc	Wed Jul 31 17:01:23 2019	(r350469)
@@ -4,3 +4,5 @@
 BINDIR=		/usr/sbin
 
 WARNS?=		1
+
+.include "../Makefile.inc"