From owner-svn-src-head@freebsd.org  Mon Mar 13 01:05:26 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 5D2D9D07AE0;
 Mon, 13 Mar 2017 01:05:26 +0000 (UTC)
 (envelope-from ngie@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 2A2D41D6D;
 Mon, 13 Mar 2017 01:05:26 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2D15PUQ056345;
 Mon, 13 Mar 2017 01:05:25 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2D15PQK056344;
 Mon, 13 Mar 2017 01:05:25 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703130105.v2D15PQK056344@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 13 Mar 2017 01:05:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315181 - head/sbin/setkey
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: Mon, 13 Mar 2017 01:05:26 -0000

Author: ngie
Date: Mon Mar 13 01:05:25 2017
New Revision: 315181
URL: https://svnweb.freebsd.org/changeset/base/315181

Log:
  Fix CFLAGS for including netipsec headers #includes
  
  The netipsec headers are referenced via netipsec/..., not ./... .
  Thus, assuming that the netipsec/... is nested under ${SRCTOP}/sys/netipsec
  is wrong.
  
  This tripped up some individuals building ^/head on systems pre-r314812.
  
  MFC after:	1 week
  Reported by:	Roberto Rodriguez Jr <rob.rodz.jr9@gmail.com>
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sbin/setkey/Makefile

Modified: head/sbin/setkey/Makefile
==============================================================================
--- head/sbin/setkey/Makefile	Sun Mar 12 20:19:37 2017	(r315180)
+++ head/sbin/setkey/Makefile	Mon Mar 13 01:05:25 2017	(r315181)
@@ -46,7 +46,7 @@ CLEANFILES=	y.tab.c y.tab.h key_test.o k
 # ipsec_strerror.c is for avoiding shlib reference to non-exported function.
 .PATH: ${SRCTOP}/lib/libipsec ${SRCTOP}/sys/netipsec
 SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
-CFLAGS+= -I${SRCTOP}/sys/netipsec
+CFLAGS+= -I${SRCTOP}/sys
 
 SRCS+=	y.tab.h
 y.tab.h: parse.y