MFC r314451,r314452,r314453,r314456,r314457,r314458,r314459,r314460,r314461,r314462,r314464,r314466,r314468,r314470,r314472,r314478:

r314451:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

The SRCTOP conversion simplifies pathing in make/displayed output.

Also, while here, change a hardcoded path to ar5523.bin.uu in the make target
with ${.ALLSRC} .

r314452:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

r314453:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

r314456:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314457:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

The SRCTOP conversion simplifies pathing in make/displayed output.

Also, while here, change a hardcoded path to ${RPCDIR}/ypupdate_prot.x in
the make targets with ${.ALLSRC} .

r314458:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314459:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314460:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314461:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314462:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

The SRCTOP conversion simplifies pathing in make/displayed output.

Also, while here, change a hardcoded path to ${RPCDIR}/ypxfrd.x in
the make targets with ${.ALLSRC} .

r314464:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314466:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314468:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

Also, use :H where possible/sensical to manipulate .CURDIR-relative paths

This simplifies pathing in make/displayed output.

r314470:

Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones

This simplifies pathing in make/displayed output.

r314472:

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

r314478:

Simplify idioms in Makefiles further

- Use SRCTOP-relative paths instead of .CURDIR-relative ones where possible
- Use :H to manipulate .CURDIR in areas instead of ..-relative paths.

40 files changed, 153 insertions, 158 deletions

diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index ac06d1c..e19e9dd 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -24,15 +24,15 @@ CFLAGS+=-I${SRCTOP}/sys
 IGNORE_PRAGMA=  YES
 
 CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS
-CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
 .endif
 
 LIBADD=	geom md
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 283d6ab..2ec8d32 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -25,10 +25,9 @@ FILES=	access.html accopt.html assoc.html audio.html authentic.html \
 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>
diff --git a/usr.sbin/ntp/doc/drivers/Makefile b/usr.sbin/ntp/doc/drivers/Makefile
index 7ae3cd2..d1c42bd 100644
--- a/usr.sbin/ntp/doc/drivers/Makefile
+++ b/usr.sbin/ntp/doc/drivers/Makefile
@@ -16,6 +16,6 @@ FILES=	driver1.html driver10.html driver11.html driver12.html driver16.html \
 	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>
diff --git a/usr.sbin/ntp/doc/drivers/icons/Makefile b/usr.sbin/ntp/doc/drivers/icons/Makefile
index e76e1fa..55746be 100644
--- a/usr.sbin/ntp/doc/drivers/icons/Makefile
+++ b/usr.sbin/ntp/doc/drivers/icons/Makefile
@@ -8,6 +8,6 @@ FILESDIR=	${SHAREDIR}/doc/ntp/drivers/icons
 FILES=	home.gif mail2.gif
 .endif
 
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/icons
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/doc/drivers/scripts/Makefile b/usr.sbin/ntp/doc/drivers/scripts/Makefile
index 44ff1a6..64a2ef8 100644
--- a/usr.sbin/ntp/doc/drivers/scripts/Makefile
+++ b/usr.sbin/ntp/doc/drivers/scripts/Makefile
@@ -8,6 +8,6 @@ FILESDIR=	${SHAREDIR}/doc/ntp/drivers/scripts
 FILES=	footer.txt style.css
 .endif
 
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/scripts
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/doc/hints/Makefile b/usr.sbin/ntp/doc/hints/Makefile
index fdbcea0..f7571f0 100644
--- a/usr.sbin/ntp/doc/hints/Makefile
+++ b/usr.sbin/ntp/doc/hints/Makefile
@@ -12,6 +12,6 @@ FILES=	a-ux aix bsdi changes decosf1 decosf2 freebsd hpux linux mpeix \
 	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>
diff --git a/usr.sbin/ntp/doc/icons/Makefile b/usr.sbin/ntp/doc/icons/Makefile
index 410a380..2faf147 100644
--- a/usr.sbin/ntp/doc/icons/Makefile
+++ b/usr.sbin/ntp/doc/icons/Makefile
@@ -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>
diff --git a/usr.sbin/ntp/doc/pic/Makefile b/usr.sbin/ntp/doc/pic/Makefile
index 11bcab6..cce1fbc 100644
--- a/usr.sbin/ntp/doc/pic/Makefile
+++ b/usr.sbin/ntp/doc/pic/Makefile
@@ -22,6 +22,6 @@ FILES=	9400n.jpg alice11.gif alice13.gif alice15.gif alice23.gif \
 	wingdorothy.gif
 .endif
 
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/pic
+.PATH: ${SRCTOP}/contrib/ntp/html/pic
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/doc/scripts/Makefile b/usr.sbin/ntp/doc/scripts/Makefile
index 13adda7..5cc430b 100644
--- a/usr.sbin/ntp/doc/scripts/Makefile
+++ b/usr.sbin/ntp/doc/scripts/Makefile
@@ -10,6 +10,6 @@ FILES=	accopt.txt audio.txt authopt.txt clockopt.txt command.txt config.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>
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 74babee..bd3b8b5 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -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=
@@ -73,14 +73,14 @@ ISC_SRCS= assertions.c \
 
 SRCS=	${NTP_SRCS} ${ISC_SRCS} 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}/../../../lib/libedit/edit \
-	-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${SRCTOP}/lib/libc/${MACHINE_ARCH} \
+	-I${SRCTOP}/lib/libedit/edit \
+	-I${.CURDIR:H} \
 	-I${.CURDIR}/
 
 CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
@@ -88,6 +88,6 @@ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
 CLEANFILES+= .version version.c
 
 version.c:
-	sh -e ${.CURDIR}/../scripts/mkver ntpd
+	sh -e ${.CURDIR:H}/scripts/mkver ntpd
 
 .include <bsd.lib.mk>
diff --git a/usr.sbin/ntp/libntpevent/Makefile b/usr.sbin/ntp/libntpevent/Makefile
index b912ed8..3c42373 100644
--- a/usr.sbin/ntp/libntpevent/Makefile
+++ b/usr.sbin/ntp/libntpevent/Makefile
@@ -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
diff --git a/usr.sbin/ntp/libopts/Makefile b/usr.sbin/ntp/libopts/Makefile
index 3c7eef7..7c10182 100644
--- a/usr.sbin/ntp/libopts/Makefile
+++ b/usr.sbin/ntp/libopts/Makefile
@@ -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>
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index e99e471..a5530ac 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -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_dcf7000.c	clk_hopf6021.c \
 	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>
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index d3f10f3..e285fe4 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -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
 
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 905ff3c..b04e4b5 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -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_control.c ntp_crypto.c ntp_filegen.c \
 	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>
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index 10352e8..afd544d 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -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
 
@@ -24,7 +24,7 @@ LIBADD+=	md
 
 CLEANFILES+= .version version.c
 
-version.c: 
-	sh -e ${.CURDIR}/../scripts/mkver ntpdate
+version.c:
+	sh -e ${.CURDIR:H}/scripts/mkver ntpdate
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index d420eb5..b60aa99 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -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 \
@@ -31,6 +30,6 @@ LIBADD+=	md
 CLEANFILES+= .version version.c
 
 version.c:
-	sh -e ${.CURDIR}/../scripts/mkver ntpdc
+	sh -e ${.CURDIR:H}/scripts/mkver ntpdc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index f9901a0..cfb2c90 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -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
 
@@ -35,6 +34,6 @@ CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 CLEANFILES+= .version version.c
 
 version.c:
-	sh -e ${.CURDIR}/../scripts/mkver ntpq
+	sh -e ${.CURDIR:H}/scripts/mkver ntpq
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index ef02d0f..9f5ae36 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -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
 
diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile
index ad480b9..11a9a5a 100644
--- a/usr.sbin/ntp/sntp/Makefile
+++ b/usr.sbin/ntp/sntp/Makefile
@@ -2,23 +2,23 @@
 
 .include <src.opts.mk>
 
-.PATH:	${.CURDIR}/../../../contrib/ntp/sntp
+.PATH:	${SRCTOP}/contrib/ntp/sntp
 
 PROG=	sntp
 MAN=
 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
 
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 9b2fb39..22887fb 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -2,8 +2,8 @@
 
 RPCDIR=	${DESTDIR}/usr/include/rpcsvc
 
-.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \
-       ${.CURDIR}/../../libexec/ypxfr ${RPCDIR}
+.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \
+       ${SRCTOP}/libexec/ypxfr ${RPCDIR}
 
 PROG=	rpc.yppasswdd
 SCRIPTS=yppwupdate
@@ -16,9 +16,9 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \
 
 WARNS?=	 5
 CFLAGS+= -fno-strict-aliasing
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \
-	 -I${.CURDIR}/../../usr.sbin/ypserv \
-	 -I${.CURDIR}/../../libexec/ypxfr \
+CFLAGS+= -I${SRCTOP}/usr.sbin/vipw \
+	 -I${SRCTOP}/usr.sbin/ypserv \
+	 -I${SRCTOP}/libexec/ypxfr \
 	 -I${.CURDIR} -I.
 LIBADD=	rpcsvc crypt util
 
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index d5c346e..4cd6114 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
+.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
 
 PROG=	rpc.ypupdated
 MAN=
@@ -9,7 +9,7 @@ SRCS=	ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \
 	yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c
 
 #CFLAGS+= -DYP
-CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr
+CFLAGS+= -I${SRCTOP}/usr.sbin/ypserv -I. -I${SRCTOP}/libexec/ypxfr
 
 WARNS?=	1
 
@@ -24,10 +24,10 @@ RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
 # ypupdated_main.c can see it.
 ypupdate_prot_svc.c: ${RPCDIR}/ypupdate_prot.x
 	rm -f ${.TARGET}
-	${RPCGEN} -m ${RPCDIR}/ypupdate_prot.x | \
+	${RPCGEN} -m ${.ALLSRC} | \
 	sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET}
 
 ypupdate_prot.h: ${RPCDIR}/ypupdate_prot.x
-	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypupdate_prot.x
+	${RPCGEN} -h -o ${.TARGET} ${.ALLSRC}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index 903ac16..0e98d83 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../usr.sbin/ypserv
+.PATH: ${SRCTOP}/usr.sbin/ypserv
 
 PROG=	rpc.ypxfrd
 MAN=	rpc.ypxfrd.8
@@ -15,14 +15,14 @@ LIBADD=	rpcsvc
 
 CLEANFILES= ypxfrd_svc.c ypxfrd.h
 
-RPCDIR=	${.CURDIR}/../../include/rpcsvc
+RPCDIR=	${SRCTOP}/include/rpcsvc
 RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
 
 # We need to remove the 'static' keyword from _rpcsvcstate so that
 # ypxfrd_main.c can see it.
 ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x
 	rm -f ${.TARGET}
-	${RPCGEN} -m ${RPCDIR}/ypxfrd.x | \
+	${RPCGEN} -m ${.ALLSRC} | \
 	sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET}
 
 # ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x
@@ -31,6 +31,6 @@ ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x
 
 ypxfrd.h: ${RPCDIR}/ypxfrd.x
 	rm -f ${.TARGET}
-	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypxfrd.x
+	${RPCGEN} -h -o ${.TARGET} ${.ALLSRC}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index c7d4155..9431d2f 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
 
 PROG=	tcpdchk
 MAN=	tcpdchk.8
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index 2f92427..49720c0 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
 
 PROG=	tcpdmatch
 MAN=	tcpdmatch.8
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index a3b6a14..7493b4d 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
 
 PROG=	traceroute
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index fc0b5fe..8cd765f 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -13,7 +13,7 @@
 # A PARTICULAR PURPOSE.
 # $FreeBSD$
 
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
 
 PROG=	traceroute6
diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile
index f8b26a4..10a7cf4 100644
--- a/usr.sbin/uathload/Makefile
+++ b/usr.sbin/uathload/Makefile
@@ -10,7 +10,7 @@ FILESMODE=	444
 
 CLEANFILES=	ar5523.bin
 
-ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu
-	uudecode -p ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu > ${.TARGET}
+ar5523.bin: ${SRCTOP}/sys/contrib/dev/uath/ar5523.bin.uu
+	uudecode -p ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile
index d2431eb..94e39d3 100644
--- a/usr.sbin/unbound/anchor/Makefile
+++ b/usr.sbin/unbound/anchor/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 # Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
-EXPATDIR= ${.CURDIR}/../../../contrib/expat
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
+EXPATDIR= ${SRCTOP}/contrib/expat
 
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
 
diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile
index e63be80..5548734 100644
--- a/usr.sbin/unbound/checkconf/Makefile
+++ b/usr.sbin/unbound/checkconf/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 # Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
 
diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile
index 928c7e9..aa96dc7 100644
--- a/usr.sbin/unbound/control/Makefile
+++ b/usr.sbin/unbound/control/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 # Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
 
diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile
index fb614fa..ce170b8 100644
--- a/usr.sbin/unbound/daemon/Makefile
+++ b/usr.sbin/unbound/daemon/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 # Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
 
 .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
 
diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile
index 1c41105..681087e 100644
--- a/usr.sbin/yp_mkdb/Makefile
+++ b/usr.sbin/yp_mkdb/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv
+.PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv
 
 PROG=	yp_mkdb
 MAN=	yp_mkdb.8
 SRCS=	yp_mkdb.c yp_dblookup.c yp_dbwrite.c
 
 CFLAGS+= -Dyp_error=warnx
-CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.sbin/ypserv
+CFLAGS+= -I${SRCTOP}/libexec/ypxfr -I${SRCTOP}/usr.sbin/ypserv
 
 WARNS?=	1
 
diff --git a/usr.sbin/ypldap/Makefile b/usr.sbin/ypldap/Makefile
index 1d3cabc..4ba12a7 100644
--- a/usr.sbin/ypldap/Makefile
+++ b/usr.sbin/ypldap/Makefile
@@ -12,8 +12,8 @@ MAN=		ypldap.8 ypldap.conf.5
 LIBADD=		openbsd event util rpcsvc
 
 CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent
-CFLAGS+=-I${.CURDIR}/../../lib/libopenbsd
+CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
+CFLAGS+=-I${SRCTOP}/lib/libopenbsd
 
 WARNS=	2
 
diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile
index 510dc10..a87be5b 100644
--- a/usr.sbin/yppush/Makefile
+++ b/usr.sbin/yppush/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-RPCDIR=	${.CURDIR}/../../include/rpcsvc
-.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
-       ${.CURDIR}/../../libexec/ypxfr
+RPCDIR=	${SRCTOP}/include/rpcsvc
+.PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
 
 PROG=	yppush
 MAN=	yppush.8
@@ -10,7 +9,7 @@ SRCS=	ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \
 	${GENSRCS}
 GENSRCS=yp.h yp_clnt.c yppush_svc.c
 
-CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr
+CFLAGS+= -I. -I${SRCTOP}/libexec/ypxfr
 
 WARNS?=	2
 
diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile
index db589ef..c229c4a 100644
--- a/usr.sbin/ypserv/Makefile
+++ b/usr.sbin/ypserv/Makefile
@@ -2,9 +2,8 @@
 
 .include <src.opts.mk>
 
-RPCDIR=	${.CURDIR}/../../include/rpcsvc
-.PATH: ${RPCDIR} \
-       ${.CURDIR}/common
+RPCDIR=	${SRCTOP}/include/rpcsvc
+.PATH: ${RPCDIR} ${.CURDIR}/common
 
 PROG=	ypserv
 MAN=	ypserv.8 ypinit.8
diff --git a/usr.sbin/zic/Makefile.inc b/usr.sbin/zic/Makefile.inc
index b915adf..19a7ea4 100644
--- a/usr.sbin/zic/Makefile.inc
+++ b/usr.sbin/zic/Makefile.inc
@@ -1,3 +1,3 @@
 # $FreeBSD$
 
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${SRCTOP}/usr.sbin/Makefile.inc"
diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile
index 2ff7db9..9671e7b 100644
--- a/usr.sbin/zic/zdump/Makefile
+++ b/usr.sbin/zic/zdump/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/tzcode/zic
+.PATH: ${SRCTOP}/contrib/tzcode/zic
 
 PROG=	zdump
 MAN=	zdump.8
@@ -8,7 +8,7 @@ SRCS=	zdump.c ialloc.c scheck.c
 
 CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
 CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
+CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime
 
 WARNS?=	2
 
diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile
index c38e3b8..9702c4c 100644
--- a/usr.sbin/zic/zic/Makefile
+++ b/usr.sbin/zic/zic/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../contrib/tzcode/zic
+.PATH: ${SRCTOP}/contrib/tzcode/zic
 
 PROG=	zic
 MAN=	zic.8
@@ -9,7 +9,7 @@ SRCS=	zic.c ialloc.c scheck.c
 CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
 CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir
 CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
+CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime
 
 WARNS?=	2
 
diff --git a/usr.sbin/zonectl/Makefile b/usr.sbin/zonectl/Makefile
index a73ae7e..5dac60d 100644
--- a/usr.sbin/zonectl/Makefile
+++ b/usr.sbin/zonectl/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	zonectl
 SRCS=	zonectl.c
-SDIR=	${.CURDIR}/../../sys
+SDIR=	${SRCTOP}/sys
 LIBADD= cam sbuf util
 MAN=	zonectl.8
 CFLAGS+=-g -O0