aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/atm/atmconfig/Makefile4
-rw-r--r--sbin/bsdlabel/Makefile2
-rw-r--r--sbin/decryptcore/Makefile2
-rw-r--r--sbin/dhclient/tests/Makefile2
-rw-r--r--sbin/etherswitchcfg/Makefile2
-rw-r--r--sbin/fdisk/Makefile2
-rw-r--r--sbin/ffsinfo/Makefile2
-rw-r--r--sbin/fsck_ffs/Makefile4
-rw-r--r--sbin/fsck_msdosfs/Makefile2
-rw-r--r--sbin/fsdb/Makefile4
-rw-r--r--sbin/gbde/Makefile8
-rw-r--r--sbin/geom/class/Makefile.inc2
-rw-r--r--sbin/geom/class/cache/Makefile2
-rw-r--r--sbin/geom/class/concat/Makefile2
-rw-r--r--sbin/geom/class/eli/Makefile4
-rw-r--r--sbin/geom/class/journal/Makefile4
-rw-r--r--sbin/geom/class/label/Makefile2
-rw-r--r--sbin/geom/class/mirror/Makefile2
-rw-r--r--sbin/geom/class/mountver/Makefile2
-rw-r--r--sbin/geom/class/multipath/Makefile4
-rw-r--r--sbin/geom/class/nop/Makefile2
-rw-r--r--sbin/geom/class/part/Makefile2
-rw-r--r--sbin/geom/class/raid/Makefile2
-rw-r--r--sbin/geom/class/raid3/Makefile2
-rw-r--r--sbin/geom/class/sched/Makefile2
-rw-r--r--sbin/geom/class/shsec/Makefile2
-rw-r--r--sbin/geom/class/stripe/Makefile2
-rw-r--r--sbin/geom/class/virstor/Makefile2
-rw-r--r--sbin/geom/core/Makefile4
-rw-r--r--sbin/ggate/ggatec/Makefile4
-rw-r--r--sbin/ggate/ggated/Makefile4
-rw-r--r--sbin/ggate/ggatel/Makefile4
-rw-r--r--sbin/growfs/Makefile6
-rw-r--r--sbin/gvinum/Makefile4
-rw-r--r--sbin/hastctl/Makefile4
-rw-r--r--sbin/init/Makefile2
-rw-r--r--sbin/ipf/Makefile.inc16
-rw-r--r--sbin/ipf/ipf/Makefile2
-rw-r--r--sbin/ipf/ipftest/Makefile4
-rw-r--r--sbin/ipf/ipresend/Makefile2
-rw-r--r--sbin/iscontrol/Makefile2
-rw-r--r--sbin/ldconfig/Makefile2
-rw-r--r--sbin/mksnap_ffs/Makefile4
-rw-r--r--sbin/mount_cd9660/Makefile2
-rw-r--r--sbin/mount_fusefs/Makefile2
-rw-r--r--sbin/mount_msdosfs/Makefile2
-rw-r--r--sbin/mount_nfs/Makefile4
-rw-r--r--sbin/mount_nullfs/Makefile2
-rw-r--r--sbin/mount_udf/Makefile4
-rw-r--r--sbin/mount_unionfs/Makefile2
-rw-r--r--sbin/newfs/Makefile4
-rw-r--r--sbin/nvmecontrol/Makefile2
-rw-r--r--sbin/pfctl/Makefile2
-rw-r--r--sbin/pflogd/Makefile6
-rw-r--r--sbin/quotacheck/Makefile2
-rw-r--r--sbin/resolvconf/Makefile2
-rw-r--r--sbin/restore/Makefile2
-rw-r--r--sbin/rtsol/Makefile2
-rw-r--r--sbin/setkey/Makefile6
-rw-r--r--sbin/sunlabel/Makefile2
-rw-r--r--sbin/umount/Makefile4
61 files changed, 95 insertions, 95 deletions
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 75a2ede8d7ff..9e8196f76465 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -34,8 +34,8 @@ WARNS?= 3
FILES= atmconfig.help atmconfig_device.help
FILESDIR= ${SHAREDIR}/doc/atm
-SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \
- ${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
+SNMP_ATM_DEF= ${SRCTOP}/contrib/ngatm/snmp_atm/atm_tree.def \
+ ${SRCTOP}/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
oid.h: atm_oid.list ${SNMP_ATM_DEF}
cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index d2e34d36e3ea..b1a71a2a74f2 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 3/17/94
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
PACKAGE=runtime
PROG= bsdlabel
diff --git a/sbin/decryptcore/Makefile b/sbin/decryptcore/Makefile
index be8b6d1c5934..423bca9c454e 100644
--- a/sbin/decryptcore/Makefile
+++ b/sbin/decryptcore/Makefile
@@ -6,7 +6,7 @@ LIBADD= crypto pjdlog
MAN= decryptcore.8
-CFLAGS+=-I${.CURDIR}/../../lib/libpjdlog
+CFLAGS+=-I${SRCTOP}/lib/libpjdlog
WARNS?= 6
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
index 2852aaf2cda8..822699c9dd01 100644
--- a/sbin/dhclient/tests/Makefile
+++ b/sbin/dhclient/tests/Makefile
@@ -5,7 +5,7 @@
PLAIN_TESTS_C= option-domain-search_test
SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \
tables.c fake.c option-domain-search.c
-CFLAGS.option-domain-search_test+= -I${.CURDIR}/..
+CFLAGS.option-domain-search_test+= -I${.CURDIR:H}
LIBADD.option-domain-search_test= util
WARNS?= 2
diff --git a/sbin/etherswitchcfg/Makefile b/sbin/etherswitchcfg/Makefile
index 547a27296bd9..6ef9f5f8a2a0 100644
--- a/sbin/etherswitchcfg/Makefile
+++ b/sbin/etherswitchcfg/Makefile
@@ -5,6 +5,6 @@ PACKAGE=runtime
PROG= etherswitchcfg
MAN= etherswitchcfg.8
SRCS= etherswitchcfg.c ifmedia.c
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
.include <bsd.prog.mk>
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index fc4bcbabc329..410f268a39d1 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -6,7 +6,7 @@ SRCS= fdisk.c geom_mbr_enc.c
WARNS?= 4
MAN= fdisk.8
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
LIBADD= geom
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index cdc9e7b3a765..19aa71ab89c4 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -4,7 +4,7 @@
# $FreeBSD$
#
-GROWFS= ${.CURDIR}/../growfs
+GROWFS= ${.CURDIR:H}/growfs
.PATH: ${GROWFS}
PACKAGE=runtime
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index b00aee5d162c..ba8a39a87e1f 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -12,8 +12,8 @@ SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \
globs.c
LIBADD= ufs
WARNS?= 2
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mount
+CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/mount
-.PATH: ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
+.PATH: ${SRCTOP}/sys/ufs/ffs ${.CURDIR:H}/mount
.include <bsd.prog.mk>
diff --git a/sbin/fsck_msdosfs/Makefile b/sbin/fsck_msdosfs/Makefile
index 0de68f18a01d..b101724a8801 100644
--- a/sbin/fsck_msdosfs/Makefile
+++ b/sbin/fsck_msdosfs/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $
# $FreeBSD$
-FSCK= ${.CURDIR}/../fsck
+FSCK= ${.CURDIR:H}/fsck
.PATH: ${FSCK}
PACKAGE=runtime
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 729f9cde2d35..a3e7545c7c5a 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -8,9 +8,9 @@ MAN= fsdb.8
SRCS= fsdb.c fsdbutil.c \
dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c
-CFLAGS+= -I${.CURDIR}/../fsck_ffs
+CFLAGS+= -I${.CURDIR:H}/fsck_ffs
WARNS?= 2
LIBADD= edit
-.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${.CURDIR:H}/fsck_ffs ${SRCTOP}/sys/ufs/ffs
.include <bsd.prog.mk>
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index 2e5dc81bf010..dcc034fd7564 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -13,10 +13,10 @@ SRCS+= g_bde_lock.c
NO_WCAST_ALIGN=
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+= -I${.CURDIR}/../../sys
-.PATH: ${.CURDIR}/../../sys/geom/bde \
- ${.CURDIR}/../../sys/crypto/rijndael \
- ${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/sys
+.PATH: ${SRCTOP}/sys/geom/bde \
+ ${SRCTOP}/sys/crypto/rijndael \
+ ${SRCTOP}/sys/crypto/sha2
CLEANFILES+= template.c
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 06b733f3c79c..6da58bbac05c 100644
--- a/sbin/geom/class/Makefile.inc
+++ b/sbin/geom/class/Makefile.inc
@@ -8,6 +8,6 @@ SRCS+= geom_${GEOM_CLASS}.c subr.c
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+= -I${.CURDIR}/../..
+CFLAGS+= -I${.CURDIR:H:H}
.include "../Makefile.inc"
diff --git a/sbin/geom/class/cache/Makefile b/sbin/geom/class/cache/Makefile
index 63b740b5e98d..e1ba031c9ffe 100644
--- a/sbin/geom/class/cache/Makefile
+++ b/sbin/geom/class/cache/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= cache
diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile
index 133805605cdb..3c370520a624 100644
--- a/sbin/geom/class/concat/Makefile
+++ b/sbin/geom/class/concat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= concat
diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile
index 74749d2df763..b9bd29268893 100644
--- a/sbin/geom/class/eli/Makefile
+++ b/sbin/geom/class/eli/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2
+.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2
GEOM_CLASS= eli
SRCS= g_eli_crypto.c
@@ -15,6 +15,6 @@ LIBADD= md crypto
WARNS?= 3
-CFLAGS+=-I${.CURDIR}/../../../../sys
+CFLAGS+=-I${SRCTOP}/sys
.include <bsd.lib.mk>
diff --git a/sbin/geom/class/journal/Makefile b/sbin/geom/class/journal/Makefile
index 14fff151b62a..3be15a13a81e 100644
--- a/sbin/geom/class/journal/Makefile
+++ b/sbin/geom/class/journal/Makefile
@@ -1,13 +1,13 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= journal
SRCS+= geom_journal_ufs.c
LIBADD= ufs md
-CFLAGS+=-I${.CURDIR}/../../../../sys
+CFLAGS+=-I${SRCTOP}/sys
.include <bsd.lib.mk>
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index 2a51c5bf288d..767924b78b61 100644
--- a/sbin/geom/class/label/Makefile
+++ b/sbin/geom/class/label/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= label
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index 195c9d580842..553e44787d8b 100644
--- a/sbin/geom/class/mirror/Makefile
+++ b/sbin/geom/class/mirror/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= mirror
diff --git a/sbin/geom/class/mountver/Makefile b/sbin/geom/class/mountver/Makefile
index 3dba58909d32..36c1e01e112a 100644
--- a/sbin/geom/class/mountver/Makefile
+++ b/sbin/geom/class/mountver/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= mountver
diff --git a/sbin/geom/class/multipath/Makefile b/sbin/geom/class/multipath/Makefile
index 2a6b7cc84ba2..5a753e42d76d 100644
--- a/sbin/geom/class/multipath/Makefile
+++ b/sbin/geom/class/multipath/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= multipath
-CFLAGS+= -I${.CURDIR}/../../../../sys
+CFLAGS+= -I${SRCTOP}/sys
.include <bsd.lib.mk>
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index 903cfcf04984..9d8b69117466 100644
--- a/sbin/geom/class/nop/Makefile
+++ b/sbin/geom/class/nop/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= nop
diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile
index b67d11f3cb01..e9631caf4d84 100644
--- a/sbin/geom/class/part/Makefile
+++ b/sbin/geom/class/part/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= part
diff --git a/sbin/geom/class/raid/Makefile b/sbin/geom/class/raid/Makefile
index 79c05a21b9f8..75d2ac7e25b7 100644
--- a/sbin/geom/class/raid/Makefile
+++ b/sbin/geom/class/raid/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= raid
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index b8bc5ea9195a..2fdf4e8f8167 100644
--- a/sbin/geom/class/raid3/Makefile
+++ b/sbin/geom/class/raid3/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= raid3
diff --git a/sbin/geom/class/sched/Makefile b/sbin/geom/class/sched/Makefile
index 17e4523a7224..ad3f5b131a18 100644
--- a/sbin/geom/class/sched/Makefile
+++ b/sbin/geom/class/sched/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= sched
diff --git a/sbin/geom/class/shsec/Makefile b/sbin/geom/class/shsec/Makefile
index 51cee346969a..f86df6c9af42 100644
--- a/sbin/geom/class/shsec/Makefile
+++ b/sbin/geom/class/shsec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= shsec
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index c0fdef1ca8b6..bbea1901749e 100644
--- a/sbin/geom/class/stripe/Makefile
+++ b/sbin/geom/class/stripe/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= stripe
diff --git a/sbin/geom/class/virstor/Makefile b/sbin/geom/class/virstor/Makefile
index 0fe24e67a548..dfbe0aeddc47 100644
--- a/sbin/geom/class/virstor/Makefile
+++ b/sbin/geom/class/virstor/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
+.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor
GEOM_CLASS= virstor
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index 8b69b72e9ee1..d892575c595d 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../misc
+.PATH: ${.CURDIR:H}/misc
PACKAGE=runtime
PROG= geom
@@ -10,7 +10,7 @@ SRCS= geom.c subr.c
NO_SHARED=NO
CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\"
-CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${SRCTOP}/sys -I${.CURDIR} -I${.CURDIR:H}
LIBADD= geom util
diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile
index e228feaf471a..0f4eb70e67aa 100644
--- a/sbin/ggate/ggatec/Makefile
+++ b/sbin/ggate/ggatec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
PROG= ggatec
MAN= ggatec.8
@@ -8,7 +8,7 @@ SRCS= ggatec.c ggate.c
CFLAGS+= -DMAX_SEND_SIZE=32768
CFLAGS+= -DLIBGEOM
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
LIBADD= geom util pthread
diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile
index 83516c675261..c5a61310c4b5 100644
--- a/sbin/ggate/ggated/Makefile
+++ b/sbin/ggate/ggated/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
PROG= ggated
MAN= ggated.8
@@ -8,6 +8,6 @@ SRCS= ggated.c ggate.c
LIBADD= pthread util
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
.include <bsd.prog.mk>
diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile
index be88bd496c36..af58c73ce1b6 100644
--- a/sbin/ggate/ggatel/Makefile
+++ b/sbin/ggate/ggatel/Makefile
@@ -1,13 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
PROG= ggatel
MAN= ggatel.8
SRCS= ggatel.c ggate.c
CFLAGS+= -DLIBGEOM
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
LIBADD= geom util
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index a75c644a4f98..bf3a8f2358e3 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -6,19 +6,19 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../mount
+.PATH: ${.CURDIR:H}/mount
PACKAGE=runtime
PROG= growfs
SRCS= growfs.c getmntopts.c
MAN= growfs.8
-CFLAGS+=-I${.CURDIR}/../mount
+CFLAGS+=-I${.CURDIR:H}/mount
.if defined(GFSDBG)
SRCS+= debug.c
CFLAGS+= -DFS_DEBUG
NO_WCAST_ALIGN= yes
-.endif
+.endif
LIBADD= util
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 5bb40eacf72e..85e2def79248 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -6,10 +6,10 @@ SRCS= gvinum.c gvinum.h geom_vinum_share.c
MAN= gvinum.8
WARNS?= 2
-CFLAGS+= -I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
+CFLAGS+= -I${SRCTOP}/sys -I${DESTDIR}/${INCLUDEDIR}/edit
LIBADD= edit geom
-.PATH: ${.CURDIR}/../../sys/geom/vinum
+.PATH: ${SRCTOP}/sys/geom/vinum
.include <bsd.prog.mk>
diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile
index f3f2ac46ab4c..00c89ef4f743 100644
--- a/sbin/hastctl/Makefile
+++ b/sbin/hastctl/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
PACKAGE=hast
-.PATH: ${.CURDIR}/../hastd
+.PATH: ${.CURDIR:H}/hastd
PROG= hastctl
SRCS= activemap.c
@@ -23,7 +23,7 @@ MAN= hastctl.8
NO_WFORMAT=
NO_WCAST_ALIGN=
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+=-I${.CURDIR}/../hastd
+CFLAGS+=-I${.CURDIR:H}/hastd
CFLAGS+=-DHAVE_CAPSICUM
CFLAGS+=-DINET
.if ${MK_INET6_SUPPORT} != "no"
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index cf6de6c12abe..f7e09501f93f 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -11,7 +11,7 @@ CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
LIBADD= util crypt
# Needed for getmntopts.c
-MOUNT= ${.CURDIR}/../../sbin/mount
+MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc
index c4c44bed6e75..a38edf3481db 100644
--- a/sbin/ipf/Makefile.inc
+++ b/sbin/ipf/Makefile.inc
@@ -6,10 +6,10 @@ WARNS?= 2
NO_WFORMAT=
NO_WARRAY_BOUNDS=
-CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter
-CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools
-CFLAGS+= -I${.CURDIR}/../../../sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter
+CFLAGS+= -I${SRCTOP}/contrib/ipfilter
+CFLAGS+= -I${SRCTOP}/contrib/ipfilter/tools
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter
CFLAGS+= -DSTATETOP -D__UIO_EXPOSE
.if ${MK_INET6_SUPPORT} != "no"
@@ -24,9 +24,9 @@ LIBADD+= ipf
CLEANFILES+= y.tab.c y.tab.h
-.PATH: ${.CURDIR}/../../../contrib/ipfilter \
- ${.CURDIR}/../../../contrib/ipfilter/lib \
- ${.CURDIR}/../../../contrib/ipfilter/tools \
- ${.CURDIR}/../../../contrib/ipfilter/man
+.PATH: ${SRCTOP}/contrib/ipfilter \
+ ${SRCTOP}/contrib/ipfilter/lib \
+ ${SRCTOP}/contrib/ipfilter/tools \
+ ${SRCTOP}/contrib/ipfilter/man
.include "../Makefile.inc"
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 1f825783b37f..33eaaea32b1b 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -31,7 +31,7 @@ ipf_l.h: lexer.h
${.ALLSRC} > ${.TARGET}
.if defined(RESCUE)
-LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS
+LIBIPF_SRCS!= cd ${.CURDIR:H}/libipf && ${MAKE} -V SRCS
SRCS+= ${LIBIPF_SRCS}
.else
LIBADD+= pcap
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 63cafabd109a..cefefdb0cf0f 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -20,11 +20,11 @@ CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \
# XXX CFLAGS+= -DIPFILTER_SCAN
-.PATH: ${.CURDIR}/../../../sys/contrib/ipfilter/netinet
+.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet
GENHDRS= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
-CLEANFILES+= ${GENHDRS}
+CLEANFILES+= ${GENHDRS}
CLEANFILES+= ipf_y.c ipf_l.c
CLEANFILES+= ipf.tab.c ipf.tab.h
CLEANFILES+= ipnat_y.c ipnat_l.c
diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile
index da1879b83175..d9b2ed5ef6e3 100644
--- a/sbin/ipf/ipresend/Makefile
+++ b/sbin/ipf/ipresend/Makefile
@@ -5,6 +5,6 @@ PROG= ipresend
SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
MAN= ipresend.1
-.PATH: ${.CURDIR}/../../../contrib/ipfilter/ipsend
+.PATH: ${SRCTOP}/contrib/ipfilter/ipsend
.include <bsd.prog.mk>
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 6b0fe3a4bfd6..07dcbfec9f1c 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -4,7 +4,7 @@ PACKAGE=iscsi_legacy
SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
PROG= iscontrol
LIBADD= cam md
-S= ${.CURDIR}/../../sys
+S= ${SRCTOP}/sys
WARNS?= 3
CFLAGS+= -I$S
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 6589dbc9c6ec..8360a3f6648e 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -3,7 +3,7 @@
PACKAGE=runtime
PROG= ldconfig
SRCS= elfhints.c ldconfig.c shlib.c support.c
-LDDIR?= ${.CURDIR}/../../libexec/rtld-aout
+LDDIR?= ${SRCTOP}/libexec/rtld-aout
CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT
MAN= ldconfig.8
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index 33040ecaf3db..a79ae2f73417 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../mount
+.PATH: ${.CURDIR:H}/mount
PACKAGE=runtime
PROG= mksnap_ffs
@@ -8,7 +8,7 @@ SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
WARNS?= 2
-CFLAGS+=-I${.CURDIR}/../mount
+CFLAGS+=-I${.CURDIR:H}/mount
.if defined(NOSUID)
BINMODE=554
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 83d58a2ab5f1..5660af8b39a4 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -7,7 +7,7 @@ SRCS= mount_cd9660.c getmntopts.c
MAN= mount_cd9660.8
LIBADD= kiconv
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+= -I${MOUNT}
# Needs to be dynamically linked for optional dlopen() access to
diff --git a/sbin/mount_fusefs/Makefile b/sbin/mount_fusefs/Makefile
index 21975800481f..4003e4fb35f6 100644
--- a/sbin/mount_fusefs/Makefile
+++ b/sbin/mount_fusefs/Makefile
@@ -25,7 +25,7 @@ PROG= mount_fusefs
SRCS= mount_fusefs.c getmntopts.c
MAN8= mount_fusefs.8
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index abbad5e186f0..e4c984484eda 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -8,7 +8,7 @@ SRCS= mount_msdosfs.c getmntopts.c
MAN= mount_msdosfs.8
LIBADD= kiconv
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+= -I${MOUNT}
# Needs to be dynamically linked for optional dlopen() access to
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 76c2bfb55ce5..a896edef898f 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -7,8 +7,8 @@ PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c mounttab.c
MAN= mount_nfs.8
-MOUNT= ${.CURDIR}/../mount
-UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
+MOUNT= ${.CURDIR:H}/mount
+UMNTALL= ${SRCTOP}/usr.sbin/rpc.umntall
CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL}
.PATH: ${MOUNT} ${UMNTALL}
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index c9b52796a1a8..43580cfdb82f 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -6,7 +6,7 @@ PROG= mount_nullfs
SRCS= mount_nullfs.c getmntopts.c
MAN= mount_nullfs.8
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index f0f50ab4b1b7..903ec7690ea4 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -6,8 +6,8 @@ SRCS= mount_udf.c getmntopts.c
MAN= mount_udf.8
LIBADD= kiconv
-MOUNT= ${.CURDIR}/../mount
-CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys
+MOUNT= ${.CURDIR:H}/mount
+CFLAGS+= -I${MOUNT} -I${SRCTOP}/sys
.PATH: ${MOUNT}
# Needs to be dynamically linked for optional dlopen() access to
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index cca1ea06222f..7e7136094995 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -6,7 +6,7 @@ PROG= mount_unionfs
SRCS= mount_unionfs.c getmntopts.c
MAN= mount_unionfs.8
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile
index 83801fd38947..9e3ea13b6e5c 100644
--- a/sbin/newfs/Makefile
+++ b/sbin/newfs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 3/27/94
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
PROG= newfs
LIBADD= ufs util
@@ -13,7 +13,7 @@ MAN= newfs.8
.include <bsd.prog.mk>
test: ${PROG}
- sh ${.CURDIR}/runtest01.sh
+ sh ${.CURDIR}/runtest01.sh
sh ${.CURDIR}/runtest00.sh | tee _.test
diff --ignore-matching-lines=FreeBSD _.test ${.CURDIR}/ref.test
echo All Tests Passed
diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile
index 7d18a371063e..787cffbfbbe7 100644
--- a/sbin/nvmecontrol/Makefile
+++ b/sbin/nvmecontrol/Makefile
@@ -6,6 +6,6 @@ SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.c \
perftest.c reset.c nvme_util.c power.c wdc.c
MAN= nvmecontrol.8
-.PATH: ${.CURDIR}/../../sys/dev/nvme
+.PATH: ${SRCTOP}/sys/dev/nvme
.include <bsd.prog.mk>
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index 91ebf5567d61..aa23d2795f43 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
# pf_ruleset.c is shared between kernel and pfctl
-.PATH: ${.CURDIR}/../../sys/netpfil/pf
+.PATH: ${SRCTOP}/sys/netpfil/pf
PACKAGE=pf
PROG= pfctl
diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
index 774ab14db6e2..423bfab8c8a2 100644
--- a/sbin/pflogd/Makefile
+++ b/sbin/pflogd/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/pf/pflogd
+.PATH: ${SRCTOP}/contrib/pf/pflogd
PACKAGE=pf
PROG= pflogd
SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c
MAN= pflogd.8
-CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
-CFLAGS+=-I${.CURDIR}/../../contrib/libpcap
+CFLAGS+=-include ${SRCTOP}/lib/libpcap/config.h
+CFLAGS+=-I${SRCTOP}/contrib/libpcap
LIBADD= pcap
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index 601c19e98a7d..6adcf7a5f572 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -8,6 +8,6 @@ WARNS?= 2
MAN= quotacheck.8
LIBADD= util
-.PATH: ${.CURDIR}/../fsck ${.CURDIR}/../fsck_ffs
+.PATH: ${.CURDIR:H}/fsck ${.CURDIR:H}/fsck_ffs
.include <bsd.prog.mk>
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile
index db33656634ab..6d7586090da0 100644
--- a/sbin/resolvconf/Makefile
+++ b/sbin/resolvconf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-DIST= ${.CURDIR}/../../contrib/openresolv
+DIST= ${SRCTOP}/contrib/openresolv
.PATH: ${DIST}
SCRIPTS= resolvconf
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 58fed3e89c4f..d6c1e6202693 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.PATH: ${.CURDIR}/../dump
+.PATH: ${.CURDIR:H}/dump
PACKAGE=runtime
PROG= restore
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index f12107a1e45f..80b38a6af77a 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -14,7 +14,7 @@
#
# $FreeBSD$
-.PATH: ${.CURDIR}/../../usr.sbin/rtsold
+.PATH: ${SRCTOP}/usr.sbin/rtsold
PACKAGE=runtime
PROG= rtsol
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 0777fff9fa67..5a9e7863406b 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -35,7 +35,7 @@ MAN= setkey.8
SRCS= setkey.c parse.y token.l
WARNS?= 1
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec
YFLAGS= -d
LIBADD= l y
@@ -44,9 +44,9 @@ CLEANFILES= y.tab.c y.tab.h key_test.o keytest
# libpfkey
# ipsec_strerror.c is for avoiding shlib reference to non-exported function.
-.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netipsec
+.PATH: ${SRCTOP}/lib/libipsec ${SRCTOP}/sys/netipsec
SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
-CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netipsec
+CFLAGS+= -I${SRCTOP}/lib/libipsec -I${SRCTOP}/sys/netipsec
SRCS+= y.tab.h
y.tab.h: parse.y
diff --git a/sbin/sunlabel/Makefile b/sbin/sunlabel/Makefile
index 21ccfd751a68..0cf449743ec8 100644
--- a/sbin/sunlabel/Makefile
+++ b/sbin/sunlabel/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
PROG= sunlabel
SRCS= sunlabel.c geom_sunlabel_enc.c
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index cdc66b9ed808..8101322cc6ef 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -7,8 +7,8 @@ PROG= umount
SRCS= umount.c vfslist.c mounttab.c
MAN= umount.8
-MOUNT= ${.CURDIR}/../mount
-UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
+MOUNT= ${.CURDIR:H}/mount
+UMNTALL= ${SRCTOP}/usr.sbin/rpc.umntall
CFLAGS+= -I${MOUNT} -I${UMNTALL}
.PATH: ${MOUNT} ${UMNTALL}