Index: sys/conf/makeLINT.mk
===================================================================
--- sys/conf/makeLINT.mk
+++ sys/conf/makeLINT.mk
@@ -3,31 +3,38 @@
 # The LINT files need to end up in the kernel source directory.
 .OBJDIR: ${.CURDIR}
 
+.if ${TARGET} == "amd64" || ${TARGET} == "i386"
+EXTRALINT=	LINT-NOINET LINT-NOINET6 LINT-NOIP
+.elif ${TARGET} == "arm"
+EXTRALINT=	LINT-V5 LINT-V7
+.elif ${TARGET} == "powerpc"
+EXTRALINT=	LINT64
+.endif
+
 all:
 	@echo "make LINT only"
 
 clean:
-	rm -f LINT
-.if ${TARGET} == "amd64" || ${TARGET} == "i386"
-	rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP
-.endif
+	rm -f LINT ${EXTRALINT}
 
 NOTES=	${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES
 MAKELINT_SED= ${.CURDIR}/../../conf/makeLINT.sed
 LINT: ${NOTES} ${MAKELINT_SED}
 	cat ${NOTES} | sed -E -n -f ${MAKELINT_SED} > ${.TARGET}
+.if !empty(EXTRALINT)
+	@for _lint in ${EXTRALINT}; do		\
+		cat ${.TARGET} > $${_lint};	\
+	done
+.endif
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
-	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET
 	echo "ident ${.TARGET}-NOINET"	>> ${.TARGET}-NOINET
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOINET
 	echo "nooptions INET"		>> ${.TARGET}-NOINET
 	echo "nodevice gre"		>> ${.TARGET}-NOINET
 	echo "nodevice netmap"		>> ${.TARGET}-NOINET
-	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET6
 	echo "ident ${.TARGET}-NOINET6"	>> ${.TARGET}-NOINET6
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOINET6
 	echo "nooptions INET6"		>> ${.TARGET}-NOINET6
-	echo "include ${.TARGET}"	>  ${.TARGET}-NOIP
 	echo "ident ${.TARGET}-NOIP"	>> ${.TARGET}-NOIP
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOIP
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOIP
@@ -48,8 +55,8 @@
 	echo "nodevice netmap"		>> ${.TARGET}-NOIP
 .endif
 .if ${TARGET} == "arm"
-	cat ${.TARGET} ${.CURDIR}/NOTES.armv5 > ${.TARGET}-V5
-	cat ${.TARGET} ${.CURDIR}/NOTES.armv7 > ${.TARGET}-V7
+	cat ${.CURDIR}/NOTES.armv5 >> ${.TARGET}-V5
+	cat ${.CURDIR}/NOTES.armv7 >> ${.TARGET}-V7
 	rm ${.TARGET}
 .endif
 .if ${TARGET} == "mips"
@@ -57,7 +64,6 @@
 .endif
 .if ${TARGET} == "powerpc"
 	# cat is available, not sure if cp is?
-	cat ${.TARGET} > ${.TARGET}64
 	echo "machine	${TARGET} powerpc" >> ${.TARGET}
 	echo "machine	${TARGET} powerpc64" >> ${.TARGET}64
 # mlx5 needs 64-bit atomics, so exclude from 32-bit PPC