From 32002b3434ee1124a9577695f3f3283f2eb59b89 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 3 Oct 2000 20:09:51 +0000
Subject: [PATCH] Blah rev 1.208 got bits of the proposed "I want the file
 /kernel to be the kernel" patch.

This commit is only the "Do not prepend `DESTDIR' to `KMODDIR' as
sys/conf/kmod.mk already does that for us" change.
---
 sys/conf/Makefile.i386    | 13 ++++++-------
 sys/conf/Makefile.powerpc | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 8bd3cb64822..e58a5fdf689 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -23,7 +23,6 @@
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
 KODIR?=		/boot/${KERNEL}
-KCOREDIR?=	${KODIR}
 STD8X16FONT?=	iso
 
 .if !defined(S)
@@ -239,18 +238,18 @@ kernel-install kernel-install.debug:
 	mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
-	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
+		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
 
 kernel-reinstall kernel-reinstall.debug:
-	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
+		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
 
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
 all:	modules
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 8bd3cb64822..e58a5fdf689 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -23,7 +23,6 @@
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
 KODIR?=		/boot/${KERNEL}
-KCOREDIR?=	${KODIR}
 STD8X16FONT?=	iso
 
 .if !defined(S)
@@ -239,18 +238,18 @@ kernel-install kernel-install.debug:
 	mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
-	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
+		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
 
 kernel-reinstall kernel-reinstall.debug:
-	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
+		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
 
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
 all:	modules