]> xenbits.xensource.com Git - freebsd.git/commitdiff
Get the readline header from the installed header instead of the from the source
authorbapt <bapt@FreeBSD.org>
Thu, 12 Sep 2019 15:46:58 +0000 (15:46 +0000)
committerbapt <bapt@FreeBSD.org>
Thu, 12 Sep 2019 15:46:58 +0000 (15:46 +0000)
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.

usr.sbin/ntp/libntp/Makefile

index 34805712381bfaf33e2742d0830b784f81efe3f3..42c89350e257592fc2bcf854efaf4414c181fe6d 100644 (file)
@@ -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}/