modules: Simplify some expressions

When we only use SYSDIR once or twice, expand it and don't define
it. Minor other consistency changes.

Sponsored by:		Netflix

Author: bsdimp

sys/modules/ktest/ktest/Makefile

@@ -1,6 +1,5 @@
 PACKAGE=	tests
-SYSDIR?=${SRCTOP}/sys
-.PATH: ${SYSDIR}/tests
+.PATH: ${SRCTOP}/sys/tests
 
 KMOD=	ktest
 SRCS=	ktest.c

sys/modules/ktest/ktest_example/Makefile

@@ -1,9 +1,8 @@
 PACKAGE=	tests
 
-SYSDIR?=${SRCTOP}/sys
-.include "${SYSDIR}/conf/kern.opts.mk"
+.include "${SRCTOP}/sys/conf/kern.opts.mk"
 
-.PATH: ${SYSDIR}/tests
+.PATH: ${SRCTOP}/sys/tests
 
 KMOD=	ktest_example
 SRCS=	ktest_example.c

sys/modules/netgraph/Makefile

@@ -1,5 +1,3 @@
-# $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
-
 SYSDIR?=${SRCTOP}/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 

sys/modules/opensolaris/Makefile

@@ -1,4 +1,4 @@
-SYSDIR?=	${SRCTOP}/sys
+SYSDIR?=${SRCTOP}/sys
 
 .PATH:		${SYSDIR}/cddl/compat/opensolaris/kern
 .PATH:		${SYSDIR}/contrib/openzfs/module/os/freebsd/spl

sys/modules/rtwn/Makefile

@@ -1,7 +1,5 @@
 .PATH: ${SRCTOP}/sys/dev/rtwn
-
-SYSDIR?=${SRCTOP}/sys
-.include "${SYSDIR}/conf/kern.opts.mk"
+.include "${SRCTOP}/sys/conf/kern.opts.mk"
 
 KMOD     = rtwn
 SRCS     = if_rtwn.c if_rtwn_tx.c if_rtwn_rx.c if_rtwn_beacon.c \

sys/modules/rtwn_pci/Makefile

@@ -1,7 +1,5 @@
 .PATH: ${SRCTOP}/sys/dev/rtwn/pci
-
-SYSDIR?=${SRCTOP}/sys
-.include "${SYSDIR}/conf/kern.opts.mk"
+.include "${SRCTOP}/sys/conf/kern.opts.mk"
 
 KMOD     = if_rtwn_pci
 SRCS	 = rtwn_pci_attach.c rtwn_pci_reg.c rtwn_pci_rx.c rtwn_pci_tx.c \

sys/modules/rtwn_usb/Makefile

@@ -1,7 +1,5 @@
 .PATH: ${SRCTOP}/sys/dev/rtwn/usb
-
-SYSDIR?=${SRCTOP}/sys
-.include "${SYSDIR}/conf/kern.opts.mk"
+.include "${SRCTOP}/sys/conf/kern.opts.mk"
 
 KMOD     = if_rtwn_usb
 SRCS	 = rtwn_usb_attach.c rtwn_usb_ep.c rtwn_usb_reg.c rtwn_usb_rx.c \

sys/modules/sound/driver/Makefile

@@ -1,5 +1,4 @@
-SYSDIR?=${SRCTOP}/sys
-.include "${SYSDIR}/conf/kern.opts.mk"
+.include "${SRCTOP}/sys/conf/kern.opts.mk"
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).

sys/modules/sound/sound/Makefile

@@ -1,5 +1,4 @@
 SYSDIR?=${SRCTOP}/sys
-
 .PATH: ${SYSDIR}/dev/sound
 .PATH: ${SYSDIR}/dev/sound/pcm
 .PATH: ${SYSDIR}/dev/sound/midi