From owner-svn-src-head@freebsd.org  Thu Sep 12 15:46:58 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 D889ED1DF0;
 Thu, 12 Sep 2019 15:46:58 +0000 (UTC)
 (envelope-from bapt@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 46TjnG5NBKz4PmB;
 Thu, 12 Sep 2019 15:46:58 +0000 (UTC)
 (envelope-from bapt@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 9BC8F20F16;
 Thu, 12 Sep 2019 15:46:58 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8CFkwq2005703;
 Thu, 12 Sep 2019 15:46:58 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8CFkwB7005702;
 Thu, 12 Sep 2019 15:46:58 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201909121546.x8CFkwB7005702@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 12 Sep 2019 15:46:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r352248 - head/usr.sbin/ntp/libntp
X-SVN-Group: head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/usr.sbin/ntp/libntp
X-SVN-Commit-Revision: 352248
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.29
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, 12 Sep 2019 15:46:58 -0000

Author: bapt
Date: Thu Sep 12 15:46:58 2019
New Revision: 352248
URL: https://svnweb.freebsd.org/changeset/base/352248

Log:
  Get the readline header from the installed header instead of the from the source
  location.
  
  With newer import of libedit, the path to be able to access readline/readline.h
  will also include header which name will conflict with some expected by ntp in
  another path and end up breaking the build.

Modified:
  head/usr.sbin/ntp/libntp/Makefile

Modified: head/usr.sbin/ntp/libntp/Makefile
==============================================================================
--- head/usr.sbin/ntp/libntp/Makefile	Thu Sep 12 15:44:53 2019	(r352247)
+++ head/usr.sbin/ntp/libntp/Makefile	Thu Sep 12 15:46:58 2019	(r352248)
@@ -79,7 +79,7 @@ CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
 	-I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
 	-I${SRCTOP}/contrib/ntp/sntp/libopts \
 	-I${SRCTOP}/lib/libc/${MACHINE_ARCH} \
-	-I${SRCTOP}/lib/libedit/edit \
+	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit \
 	-I${.CURDIR:H} \
 	-I${.CURDIR}/