summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-03-02 21:18:40 +0000
committerru <ru@FreeBSD.org>2003-03-02 21:18:40 +0000
commit41871f8dff463c32e251cd5dd4540980038ab5d2 (patch)
tree0a933feed2908f562382f9cb170b2f619cf5a2f9
parent192740835f3695eed45758186220a625851144fc (diff)
downloadFreeBSD-src-41871f8dff463c32e251cd5dd4540980038ab5d2.zip
FreeBSD-src-41871f8dff463c32e251cd5dd4540980038ab5d2.tar.gz
Fixed sys/boot/pc98/boot2/Makefile to use kern.mk and
get rid of bsd.kern.mk completely. OK'ed by: bde
-rw-r--r--share/mk/Makefile2
-rw-r--r--share/mk/bsd.kern.mk13
-rw-r--r--sys/boot/pc98/boot2/Makefile2
3 files changed, 2 insertions, 15 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 5a2488a..4a3fe83 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -4,7 +4,7 @@
FILES= bsd.README
FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk
FILES+= bsd.incs.mk bsd.info.mk bsd.init.mk
-FILES+= bsd.kern.mk bsd.kmod.mk
+FILES+= bsd.kmod.mk
FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk
FILES+= bsd.obj.mk bsd.own.mk
FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk
diff --git a/share/mk/bsd.kern.mk b/share/mk/bsd.kern.mk
deleted file mode 100644
index e374d5f..0000000
--- a/share/mk/bsd.kern.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-# Search for kernel source tree in standard places.
-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. /sys /usr/src/sys
-.if !defined(SYSDIR) && exists(${_dir}/conf/kern.mk)
-SYSDIR= ${_dir}
-.endif
-.endfor
-.if !defined(SYSDIR) || !exists(${SYSDIR}/kern) || !exists(${SYSDIR}/conf/)
-.error "can't find kernel source tree"
-.endif
-
-.include "${SYSDIR}/conf/kern.mk"
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index ba5d723..d3ab21c 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -102,5 +102,5 @@ machine:
CLEANFILES+= machine
-.include <bsd.kern.mk>
+.include "${.CURDIR}/../../../conf/kern.mk"
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud