MFC r314651,r318439,r318440:

r314651:

sys/modules: normalize .CURDIR-relative paths to SRCTOP

This simplifies make output/logic

Tested with:	`cd sys/modules; make ALL_MODULES=` on amd64

r318439:

Normalize .PATH on SRCTOP

This will help Jenkins dedupe 9 warnings between the static build and
the module build of ipsec(4).

Missed in SRCTOP conversion in r314651.

MFC with:	r314651

r318440:

Normalize SYSDIR on SRCTOP instead of .CURDIR

This is being done to simplify pathing for CFLAGS and source files.

5 files changed, 18 insertions, 18 deletions

diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile
index e2a2533..dd28d13 100644
--- a/sys/modules/hyperv/netvsc/Makefile
+++ b/sys/modules/hyperv/netvsc/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../dev/hyperv/netvsc \
-	${.CURDIR}/../../../dev/hyperv/vmbus
+.PATH:  ${SRCTOP}/sys/dev/hyperv/netvsc \
+	${SRCTOP}/sys/dev/hyperv/vmbus
 
 KMOD=	hv_netvsc
 SRCS=	hn_nvs.c hn_rndis.c if_hn.c
 SRCS+=	bus_if.h device_if.h vmbus_if.h
 SRCS+=	opt_hn.h opt_inet.h opt_inet6.h opt_rss.h
 
-CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/netvsc
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/netvsc
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/pcib/Makefile b/sys/modules/hyperv/pcib/Makefile
index 1b63a13..83e960d 100644
--- a/sys/modules/hyperv/pcib/Makefile
+++ b/sys/modules/hyperv/pcib/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../dev/hyperv/pcib \
-	${.CURDIR}/../../../dev/hyperv/vmbus
+.PATH:  ${SRCTOP}/sys/dev/hyperv/pcib \
+	${SRCTOP}/sys/dev/hyperv/vmbus
 
 KMOD=	vmbus_pcib
 SRCS=	vmbus_pcib.c
 SRCS+=	bus_if.h device_if.h pci_if.h pcib_if.h vmbus_if.h
 
-CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/pcib
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/pcib
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile
index 5f38b13..a755772 100644
--- a/sys/modules/hyperv/storvsc/Makefile
+++ b/sys/modules/hyperv/storvsc/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../dev/hyperv/storvsc \
-	${.CURDIR}/../../../dev/hyperv/vmbus \
+.PATH:  ${SRCTOP}/sys/dev/hyperv/storvsc \
+	${SRCTOP}/sys/dev/hyperv/vmbus \
 
 KMOD=	hv_storvsc
 SRCS =	hv_storvsc_drv_freebsd.c \
 	hv_vstorage.h
 SRCS+=	bus_if.h device_if.h opt_cam.h vmbus_if.h
 
-CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
-	 -I${.CURDIR}/../../../dev/hyperv/vmbus	\
-	 -I${.CURDIR}/../../../dev/hyperv/storvsc
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \
+	 -I${SRCTOP}/sys/dev/hyperv/vmbus	\
+	 -I${SRCTOP}/sys/dev/hyperv/storvsc
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
index deb2e8b..53dc4b2 100644
--- a/sys/modules/hyperv/utilities/Makefile
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../dev/hyperv/utilities
+.PATH:	${SRCTOP}/sys/dev/hyperv/utilities
 
 KMOD=	hv_utils
 SRCS=	vmbus_ic.c
@@ -11,7 +11,7 @@ SRCS+=	vmbus_shutdown.c
 SRCS+=	vmbus_timesync.c
 SRCS+=	bus_if.h device_if.h vmbus_if.h
 
-CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
-	 -I${.CURDIR}/../../../dev/hyperv/vmbus
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \
+	 -I${SRCTOP}/sys/dev/hyperv/vmbus
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile
index 0a78d5d..944bf75 100644
--- a/sys/modules/hyperv/vmbus/Makefile
+++ b/sys/modules/hyperv/vmbus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../dev/hyperv/vmbus \
-	${.CURDIR}/../../../dev/hyperv/vmbus/${MACHINE_CPUARCH}
+.PATH:	${SRCTOP}/sys/dev/hyperv/vmbus \
+	${SRCTOP}/sys/dev/hyperv/vmbus/${MACHINE_CPUARCH}
 
 KMOD=	hv_vmbus
 SRCS=	hyperv.c \
@@ -29,7 +29,7 @@ vmbus_vector.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
             ${.IMPSRC} -o ${.TARGET}
 
-CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
-	 -I${.CURDIR}/../../../dev/hyperv/vmbus
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \
+	 -I${SRCTOP}/sys/dev/hyperv/vmbus
 
 .include <bsd.kmod.mk>