Do not prepend `DESTDIR' to `KMODDIR' as sys/conf/kmod.mk already does

that for us.

5 files changed, 19 insertions, 17 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 851167d..ef094bb 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -306,7 +306,7 @@ install install.debug: modules-install
 reinstall reinstall.debug: modules-reinstall
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index c6b2b5d..8bd3cb6 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -23,6 +23,7 @@
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
 KODIR?=		/boot/${KERNEL}
+KCOREDIR?=	${KODIR}
 STD8X16FONT?=	iso
 
 .if !defined(S)
@@ -238,18 +239,18 @@ kernel-install kernel-install.debug:
 	mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
-	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
+		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
 
 kernel-reinstall kernel-reinstall.debug:
-	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
+		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
 
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
 all:	modules
@@ -262,7 +263,7 @@ install install.debug: modules-install
 reinstall reinstall.debug: modules-reinstall
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index c75c199..dacc1f6 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -271,7 +271,7 @@ install install.debug: modules-install
 reinstall reinstall.debug: modules-reinstall
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index ef8afd0..3ec5943 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -265,7 +265,7 @@ install install.debug: modules-install
 reinstall reinstall.debug: modules-reinstall
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index c6b2b5d..8bd3cb6 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -23,6 +23,7 @@
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
 KODIR?=		/boot/${KERNEL}
+KCOREDIR?=	${KODIR}
 STD8X16FONT?=	iso
 
 .if !defined(S)
@@ -238,18 +239,18 @@ kernel-install kernel-install.debug:
 	mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
-	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR}
+		${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KCOREDIR}
 
 kernel-reinstall kernel-reinstall.debug:
-	@if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
-	    chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \
+	@if [ -f ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ] ; then \
+	    chflags noschg ${DESTDIR}${KCOREDIR}/${KERNEL_KO} ; \
 	fi
 	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR}
+		${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KCOREDIR}
 
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
 all:	modules
@@ -262,7 +263,7 @@ install install.debug: modules-install
 reinstall reinstall.debug: modules-reinstall
 .endif
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR}
+MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules