13 files changed, 15 insertions, 15 deletions
diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile
index c36ef2a66ac10..434be3ba6a98e 100644
--- a/sys/modules/cxgbe/Makefile
+++ b/sys/modules/cxgbe/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-SYSDIR?=${.CURDIR}/../..
+SYSDIR?=${SRCTOP}/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=	if_cxgbe
diff --git a/sys/modules/cxgbe/cxgbei/Makefile b/sys/modules/cxgbe/cxgbei/Makefile
index bf577514bd7e7..ecd92218c8ef8 100644
--- a/sys/modules/cxgbe/cxgbei/Makefile
+++ b/sys/modules/cxgbe/cxgbei/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE = ${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}/cxgbei
 
 KMOD=	cxgbei
diff --git a/sys/modules/cxgbe/if_cc/Makefile b/sys/modules/cxgbe/if_cc/Makefile
index f81d174d3236c..f7cc10d44866d 100644
--- a/sys/modules/cxgbe/if_cc/Makefile
+++ b/sys/modules/cxgbe/if_cc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}
 
 KMOD=	if_cc
diff --git a/sys/modules/cxgbe/if_ccv/Makefile b/sys/modules/cxgbe/if_ccv/Makefile
index 0fcc03c4b6cd9..70700fceee5f4 100644
--- a/sys/modules/cxgbe/if_ccv/Makefile
+++ b/sys/modules/cxgbe/if_ccv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}
 
 KMOD=	if_ccv
diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile
index a86b145651fb3..5c711c4899d73 100644
--- a/sys/modules/cxgbe/if_cxgbe/Makefile
+++ b/sys/modules/cxgbe/if_cxgbe/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE} ${CXGBE}/common
 
 KMOD=	if_cxgbe
diff --git a/sys/modules/cxgbe/if_cxgbev/Makefile b/sys/modules/cxgbe/if_cxgbev/Makefile
index 9c72a7aad4072..4a66572080acc 100644
--- a/sys/modules/cxgbe/if_cxgbev/Makefile
+++ b/sys/modules/cxgbe/if_cxgbev/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE} ${CXGBE}/common
 
 KMOD=	if_cxgbev
diff --git a/sys/modules/cxgbe/if_cxl/Makefile b/sys/modules/cxgbe/if_cxl/Makefile
index ec4ff1ed18020..f18cec139e130 100644
--- a/sys/modules/cxgbe/if_cxl/Makefile
+++ b/sys/modules/cxgbe/if_cxl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}
 
 KMOD=	if_cxl
diff --git a/sys/modules/cxgbe/if_cxlv/Makefile b/sys/modules/cxgbe/if_cxlv/Makefile
index 943ea58bc2a56..ab69c0bc77ac4 100644
--- a/sys/modules/cxgbe/if_cxlv/Makefile
+++ b/sys/modules/cxgbe/if_cxlv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}
 
 KMOD=	if_cxlv
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
index d4c041f009106..b07fe1b7027bc 100644
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}/iw_cxgbe
 
 KMOD=	iw_cxgbe
@@ -23,7 +23,7 @@ SRCS+=	qp.c
 SRCS+=	resource.c
 SRCS+=	vnode_if.h
 
-CFLAGS+= -I${CXGBE} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED
-CFLAGS+= -I${.CURDIR}/../../../compat/linuxkpi/common/include
+CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED
+CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile
index 3feceada37337..7f1ed93005fef 100644
--- a/sys/modules/cxgbe/t4_firmware/Makefile
+++ b/sys/modules/cxgbe/t4_firmware/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-T4FW=	${.CURDIR}/../../../dev/cxgbe/firmware
+T4FW=	${SRCTOP}/sys/dev/cxgbe/firmware
 .PATH: ${T4FW}
 
 KMOD=	t4fw_cfg
diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile
index 2419a191f8649..ab952ae3af560 100644
--- a/sys/modules/cxgbe/t5_firmware/Makefile
+++ b/sys/modules/cxgbe/t5_firmware/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-T5FW=	${.CURDIR}/../../../dev/cxgbe/firmware
+T5FW=	${SRCTOP}/sys/dev/cxgbe/firmware
 .PATH: ${T5FW}
 
 KMOD=	t5fw_cfg
diff --git a/sys/modules/cxgbe/t6_firmware/Makefile b/sys/modules/cxgbe/t6_firmware/Makefile
index 9bdde07b84f58..75d77720e21cf 100644
--- a/sys/modules/cxgbe/t6_firmware/Makefile
+++ b/sys/modules/cxgbe/t6_firmware/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-T6FW=	${.CURDIR}/../../../dev/cxgbe/firmware
+T6FW=	${SRCTOP}/sys/dev/cxgbe/firmware
 .PATH: ${T6FW}
 
 KMOD=	t6fw_cfg
diff --git a/sys/modules/cxgbe/tom/Makefile b/sys/modules/cxgbe/tom/Makefile
index 5f460e04d65a7..96daf2c441a87 100644
--- a/sys/modules/cxgbe/tom/Makefile
+++ b/sys/modules/cxgbe/tom/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-CXGBE=	${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${SRCTOP}/sys/dev/cxgbe
 .PATH: ${CXGBE}/tom
 
 KMOD=	t4_tom