svn commit: r357107 - in stable: 11/share/mk 12/share/mk

[Kyle Evans]

Author: kevans
Date: Sat Jan 25 05:17:44 2020
New Revision: 357107
URL: https://svnweb.freebsd.org/changeset/base/357107

Log:
  MFC r354968, r354976: Introduce, but do not use, bsd.sysdir.mk
  
  [Some sysent bits use bsd.sysdir.mk now, but I don't see a point in
  converting existing stuff]
  
  MFC r354968: Introduce bsd.sysdir.mk to consolidate looking for the kernel.
  
  MFC r354976: Install bsd.sysdir.mk

Added:
  stable/12/share/mk/bsd.sysdir.mk
     - copied unchanged from r354968, head/share/mk/bsd.sysdir.mk
Modified:
  stable/12/share/mk/Makefile
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Added:
  stable/11/share/mk/bsd.sysdir.mk
     - copied unchanged from r354968, head/share/mk/bsd.sysdir.mk
Modified:
  stable/11/share/mk/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/share/mk/Makefile
==============================================================================
--- stable/12/share/mk/Makefile	Sat Jan 25 04:57:26 2020	(r357106)
+++ stable/12/share/mk/Makefile	Sat Jan 25 05:17:44 2020	(r357107)
@@ -55,6 +55,7 @@ FILES=	\
 	bsd.suffixes.mk \
 	bsd.symver.mk \
 	bsd.sys.mk \
+	bsd.sysdir.mk \
 	bsd.test.mk \
 	dirdeps.mk \
 	dirdeps-options.mk \

Copied: stable/12/share/mk/bsd.sysdir.mk (from r354968, head/share/mk/bsd.sysdir.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/share/mk/bsd.sysdir.mk	Sat Jan 25 05:17:44 2020	(r357107, copy of r354968, head/share/mk/bsd.sysdir.mk)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+# Search for kernel source tree in standard places.
+.if !defined(SYSDIR)
+.for _dir in ${SRCTOP:D${SRCTOP}/sys} \
+    ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+    ${.CURDIR}/../../../../.. /sys /usr/src/sys
+.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
+SYSDIR=	${_dir:tA}
+.endif
+.endfor
+.endif
+.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
+    !exists(${SYSDIR}/conf/kmod.mk)
+.error Unable to locate the kernel source tree. Set SYSDIR to override.
+.endif