MFC r314655:

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

This simplifies make logic/output

17 files changed, 20 insertions, 20 deletions

diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 06b733f..6da58bb 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 63b740b..e1ba031 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 1338056..3c37052 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 74749d2..b9bd292 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 14fff15..3be15a1 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 2a51c5b..767924b 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 195c9d5..553e447 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 3dba589..36c1e01 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 2a6b7cc..5a753e4 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 903cfcf0..9d8b691 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 b67d11f..e9631ca 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 79c05a2..75d2ac7 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 b8bc5ea..2fdf4e8 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 17e4523..ad3f5b1 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 51cee34..f86df6c 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 c0fdef1..bbea190 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 0fe24e6..dfbe0ae 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