From 73f643b4119cc901a17b79e97633dd129ecb7f3e Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Sun, 2 Mar 2003 21:18:40 +0000 Subject: [PATCH] Fixed sys/boot/pc98/boot2/Makefile to use kern.mk and get rid of bsd.kern.mk completely. OK'ed by: bde --- share/mk/Makefile | 2 +- share/mk/bsd.kern.mk | 13 ------------- sys/boot/pc98/boot2/Makefile | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 share/mk/bsd.kern.mk diff --git a/share/mk/Makefile b/share/mk/Makefile index 5a2488a0eaea..4a3fe8372e1c 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 e374d5f6fa04..000000000000 --- 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 ba5d7230717a..d3ab21cba396 100644 --- a/sys/boot/pc98/boot2/Makefile +++ b/sys/boot/pc98/boot2/Makefile @@ -102,5 +102,5 @@ machine: CLEANFILES+= machine -.include +.include "${.CURDIR}/../../../conf/kern.mk" .include