Author: ngie
Date: Wed Mar  1 04:54:06 2017
New Revision: 314472
URL: https://svnweb.freebsd.org/changeset/base/314472

Log:
  Simplify/improve idioms in usr.sbin/ntp Makefiles
  
  - Use SRCTOP-relative paths to other directories instead of
    .CURDIR-relative ones. This simplifies pathing in make/displayed output.
  - Also, use :H where possible/sensical to manipulate .CURDIR-relative
    paths
  - Remove superfluous bsd.own.mk .includes which are already handled via
    src.opts.mk .includes
  
  MFC after:    1 week
  Sponsored by: Dell EMC Isilon

Modified:
  head/usr.sbin/ntp/doc/Makefile
  head/usr.sbin/ntp/doc/drivers/Makefile
  head/usr.sbin/ntp/doc/drivers/icons/Makefile
  head/usr.sbin/ntp/doc/drivers/scripts/Makefile
  head/usr.sbin/ntp/doc/hints/Makefile
  head/usr.sbin/ntp/doc/icons/Makefile
  head/usr.sbin/ntp/doc/pic/Makefile
  head/usr.sbin/ntp/doc/scripts/Makefile
  head/usr.sbin/ntp/libntp/Makefile
  head/usr.sbin/ntp/libntpevent/Makefile
  head/usr.sbin/ntp/libopts/Makefile
  head/usr.sbin/ntp/libparse/Makefile
  head/usr.sbin/ntp/ntp-keygen/Makefile
  head/usr.sbin/ntp/ntpd/Makefile
  head/usr.sbin/ntp/ntpdate/Makefile
  head/usr.sbin/ntp/ntpdc/Makefile
  head/usr.sbin/ntp/ntpq/Makefile
  head/usr.sbin/ntp/ntptime/Makefile
  head/usr.sbin/ntp/sntp/Makefile

Modified: head/usr.sbin/ntp/doc/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/Makefile      Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/doc/Makefile      Wed Mar  1 04:54:06 2017        
(r314472)
@@ -25,10 +25,9 @@ FILES=       access.html accopt.html assoc.htm
 MAN=   ntp.conf.5 ntp.keys.5
 MAN+=  ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 sntp.8
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/html \
-       ${.CURDIR}/../../../contrib/ntp/util \
-       ${.CURDIR}/../../../contrib/ntp/util \
-       ${.CURDIR}/../../../contrib/ntp/ntpd \
-       ${.CURDIR}/../../../contrib/ntp/ntpsnmpd
+.PATH: ${SRCTOP}/contrib/ntp/html \
+       ${SRCTOP}/contrib/ntp/util \
+       ${SRCTOP}/contrib/ntp/ntpd \
+       ${SRCTOP}/contrib/ntp/ntpsnmpd
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/drivers/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/drivers/Makefile      Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/doc/drivers/Makefile      Wed Mar  1 04:54:06 2017        
(r314472)
@@ -16,6 +16,6 @@ FILES=        driver1.html driver10.html driver
        driver9.html mx4200data.html oncore-shmem.html tf582_4.html
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/drivers
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/drivers/icons/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/drivers/icons/Makefile        Wed Mar  1 04:47:22 
2017        (r314471)
+++ head/usr.sbin/ntp/doc/drivers/icons/Makefile        Wed Mar  1 04:54:06 
2017        (r314472)
@@ -8,6 +8,6 @@ FILESDIR=       ${SHAREDIR}/doc/ntp/drivers/ic
 FILES= home.gif mail2.gif
 .endif
 
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/icons
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/drivers/scripts/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/drivers/scripts/Makefile      Wed Mar  1 04:47:22 
2017        (r314471)
+++ head/usr.sbin/ntp/doc/drivers/scripts/Makefile      Wed Mar  1 04:54:06 
2017        (r314472)
@@ -8,6 +8,6 @@ FILESDIR=       ${SHAREDIR}/doc/ntp/drivers/sc
 FILES= footer.txt style.css
 .endif
 
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/scripts
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/hints/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/hints/Makefile        Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/doc/hints/Makefile        Wed Mar  1 04:54:06 2017        
(r314472)
@@ -12,6 +12,6 @@ FILES=        a-ux aix bsdi changes decosf1 dec
        sun4 svr4-dell svr4_package todo vxworks.html winnt.html
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/hints
+.PATH: ${SRCTOP}/contrib/ntp/html/hints
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/icons/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/icons/Makefile        Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/doc/icons/Makefile        Wed Mar  1 04:54:06 2017        
(r314472)
@@ -8,6 +8,6 @@ FILESDIR=       ${SHAREDIR}/doc/ntp/icons
 FILES= home.gif mail2.gif sitemap.png
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/icons
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/pic/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/pic/Makefile  Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/doc/pic/Makefile  Wed Mar  1 04:54:06 2017        
(r314472)
@@ -22,6 +22,6 @@ FILES=        9400n.jpg alice11.gif alice13.gif
        wingdorothy.gif
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/pic
+.PATH: ${SRCTOP}/contrib/ntp/html/pic
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/doc/scripts/Makefile
==============================================================================
--- head/usr.sbin/ntp/doc/scripts/Makefile      Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/doc/scripts/Makefile      Wed Mar  1 04:54:06 2017        
(r314472)
@@ -10,6 +10,6 @@ FILES=        accopt.txt audio.txt authopt.txt 
        misc.txt miscopt.txt monopt.txt refclock.txt special.txt style.css
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/scripts
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/libntp/Makefile
==============================================================================
--- head/usr.sbin/ntp/libntp/Makefile   Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/libntp/Makefile   Wed Mar  1 04:54:06 2017        
(r314472)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/libntp \
-       ${.CURDIR}/../../../contrib/ntp/lib/isc \
-       ${.CURDIR}/../../../contrib/ntp/lib/isc/nls \
-       ${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads \
-       ${.CURDIR}/../../../contrib/ntp/lib/isc/unix \
+.PATH: ${SRCTOP}/contrib/ntp/libntp \
+       ${SRCTOP}/contrib/ntp/lib/isc \
+       ${SRCTOP}/contrib/ntp/lib/isc/nls \
+       ${SRCTOP}/contrib/ntp/lib/isc/pthreads \
+       ${SRCTOP}/contrib/ntp/lib/isc/unix \
 
 LIB= ntp
 INTERNALLIB=

Modified: head/usr.sbin/ntp/libntpevent/Makefile
==============================================================================
--- head/usr.sbin/ntp/libntpevent/Makefile      Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/libntpevent/Makefile      Wed Mar  1 04:54:06 2017        
(r314472)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libevent
+.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent
 
 LIB= ntpevent
 INTERNALLIB=
@@ -25,8 +25,8 @@ NTP_ATOMIC=sparc64
 NTP_ATOMIC=noatomic
 .endif
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/sntp/libevent/include \
        -I${.CURDIR}/
 
 CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H

Modified: head/usr.sbin/ntp/libopts/Makefile
==============================================================================
--- head/usr.sbin/ntp/libopts/Makefile  Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/libopts/Makefile  Wed Mar  1 04:54:06 2017        
(r314472)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libopts 
+.PATH: ${SRCTOP}/contrib/ntp/sntp/libopts
 
 LIB=   opts
 INTERNALLIB=
 
 SRCS=  libopts.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-       -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/sntp/libopts \
+       -I${.CURDIR:H}
 
 .include <bsd.lib.mk>

Modified: head/usr.sbin/ntp/libparse/Makefile
==============================================================================
--- head/usr.sbin/ntp/libparse/Makefile Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/libparse/Makefile Wed Mar  1 04:54:06 2017        
(r314472)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/libparse
+.PATH: ${SRCTOP}/contrib/ntp/libparse
 
 LIB=   parse
 INTERNALLIB=
@@ -12,8 +12,8 @@ SRCS= binio.c clk_computime.c clk_dcf700
        info_trimble.c  mfp_mul.c       parse.c parse_conf.c \
        trim_info.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include -I${.CURDIR:H}
 
 .include <bsd.lib.mk>

Modified: head/usr.sbin/ntp/ntp-keygen/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntp-keygen/Makefile       Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/ntp-keygen/Makefile       Wed Mar  1 04:54:06 2017        
(r314472)
@@ -4,21 +4,21 @@ MAN=
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/util \
-       ${.CURDIR}/../../../contrib/ntp/ntpd
+.PATH: ${SRCTOP}/contrib/ntp/util \
+       ${SRCTOP}/contrib/ntp/ntpd
 
 PROG=  ntp-keygen
 SRCS=  ntp-keygen.c ntp-keygen-opts.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-       -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-       -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
+       -I${SRCTOP}/contrib/ntp/sntp/libopts \
+       -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
+       -I${.CURDIR:H}
 
 LIBADD+=       ntp opts pthread
 

Modified: head/usr.sbin/ntp/ntpd/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpd/Makefile     Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/ntpd/Makefile     Wed Mar  1 04:54:06 2017        
(r314472)
@@ -4,7 +4,7 @@ MAN=
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd \
+.PATH: ${SRCTOP}/contrib/ntp/ntpd \
        ${.OBJDIR}
 
 PROG=  ntpd
@@ -27,13 +27,13 @@ SRCS=       cmd_args.c ntp_config.c ntp_contro
        refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \
        refclock_zyfer.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \
-       -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-       -I${.CURDIR}/../ \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/ntpd \
+       -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+       -I${SRCTOP}/contrib/ntp/sntp/libopts \
+       -I${.CURDIR:H} \
        -I${.CURDIR}
 
 LIBADD=        parse ntp m opts pthread
@@ -46,7 +46,7 @@ LIBADD+=      md
 
 CLEANFILES+= .version version.c
 
-version.c: 
-       sh -e ${.CURDIR}/../scripts/mkver ntpd
+version.c:
+       sh -e ${.CURDIR:H}/scripts/mkver ntpd
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/ntp/ntpdate/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpdate/Makefile  Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/ntpdate/Makefile  Wed Mar  1 04:54:06 2017        
(r314472)
@@ -2,17 +2,17 @@
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
+.PATH: ${SRCTOP}/contrib/ntp/ntpdate
 
 PROG=  ntpdate
 MAN=
 SRCS=  ntpdate.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include/ \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${.CURDIR:H}
 
 LIBADD=        ntp m pthread
 

Modified: head/usr.sbin/ntp/ntpdc/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpdc/Makefile    Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/ntpdc/Makefile    Wed Mar  1 04:54:06 2017        
(r314472)
@@ -3,20 +3,19 @@
 MAN=
 
 .include <src.opts.mk>
-.include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc
+.PATH: ${SRCTOP}/contrib/ntp/ntpdc
 
 PROG=  ntpdc
 SRCS=  ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-       -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
-       -I${.CURDIR}/../ -I${.CURDIR}
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${SRCTOP}/contrib/ntp/sntp/libopts \
+       -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
+       -I${.CURDIR:H} -I${.CURDIR}
 
 LIBADD=        edit ntp m opts pthread
 CFLAGS+=       -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \

Modified: head/usr.sbin/ntp/ntpq/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntpq/Makefile     Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/ntpq/Makefile     Wed Mar  1 04:54:06 2017        
(r314472)
@@ -3,23 +3,22 @@
 MAN=
 
 .include <src.opts.mk>
-.include <bsd.own.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq
+.PATH: ${SRCTOP}/contrib/ntp/ntpq
 
 BINDIR=        /usr/bin
 
 PROG=  ntpq
 SRCS=  ntpq.c ntpq-opts.c ntpq-subs.c version.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-       -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
+       -I${SRCTOP}/contrib/ntp/sntp/libopts \
+       -I${.CURDIR:H}
 
 LIBADD+=       edit ntp opts m pthread
 

Modified: head/usr.sbin/ntp/ntptime/Makefile
==============================================================================
--- head/usr.sbin/ntp/ntptime/Makefile  Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/ntptime/Makefile  Wed Mar  1 04:54:06 2017        
(r314472)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/util
+.PATH: ${SRCTOP}/contrib/ntp/util
 
 PROG=  ntptime
 MAN=
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include/ \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${.CURDIR:H}
 
 LIBADD=        ntp pthread
 

Modified: head/usr.sbin/ntp/sntp/Makefile
==============================================================================
--- head/usr.sbin/ntp/sntp/Makefile     Wed Mar  1 04:47:22 2017        
(r314471)
+++ head/usr.sbin/ntp/sntp/Makefile     Wed Mar  1 04:54:06 2017        
(r314472)
@@ -2,23 +2,23 @@
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp
+.PATH: ${SRCTOP}/contrib/ntp/sntp
 
 PROG=  sntp
 MK_MAN=        no
 SRCS=  crypto.c kod_management.c log.c main.c networking.c \
        sntp-opts.c sntp.c utilities.c
 
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
-       -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
-       -I${.CURDIR}/../../../contrib/ntp/sntp \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
-       -I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \
-       -I${.CURDIR}/../libntpevent \
-       -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+       -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+       -I${SRCTOP}/contrib/ntp/sntp \
+       -I${SRCTOP}/contrib/ntp/sntp/libopts \
+       -I${SRCTOP}/contrib/ntp/sntp/libevent/include \
+       -I${.CURDIR:H}/libntpevent \
+       -I${.CURDIR:H}
 
 LIBADD=        m opts ntp ntpevent pthread
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to