sbin: normalize paths using SRCTOP-relative paths or :H when possible

This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon

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` \

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

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
 

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

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>

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
 

sbin/ffsinfo/Makefile

@@ -4,7 +4,7 @@
 # $FreeBSD$
 #
 
-GROWFS= ${.CURDIR}/../growfs
+GROWFS= ${.CURDIR:H}/growfs
 .PATH: ${GROWFS}
 
 PACKAGE=runtime

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>

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

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>

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
 

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"

sbin/geom/class/cache/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	cache
 

sbin/geom/class/concat/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	concat
 

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>

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>

sbin/geom/class/label/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	label
 

sbin/geom/class/mirror/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	mirror
 

sbin/geom/class/mountver/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	mountver
 

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>

sbin/geom/class/nop/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	nop
 

sbin/geom/class/part/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	part
 

sbin/geom/class/raid/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	raid
 

sbin/geom/class/raid3/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	raid3
 

sbin/geom/class/sched/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	sched
 

sbin/geom/class/shsec/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	shsec
 

sbin/geom/class/stripe/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
 
 GEOM_CLASS=	stripe
 

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
 

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
 

sbin/ggate/ggatec/Makefile

@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
 
 PROG=	ggatec
 MAN=	ggatec.8
 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
 

sbin/ggate/ggated/Makefile

@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
 
 PROG=	ggated
 MAN=	ggated.8
 SRCS=	ggated.c ggate.c
 
 LIBADD=	pthread util
 
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
 
 .include <bsd.prog.mk>

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
 

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
 

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>