--- kern.pre.mk.org	2008-09-15 22:09:03 +0200
+++ kern.pre.mk	2008-09-23 13:35:42 +0200
@@ -103,10 +103,17 @@
 FULLKERNEL=	${KERNEL}.nodebug
 SELECTEDKERNEL= ${KERNEL}.stripped
 .endif
-DESTKERNNAME?=	${KERNEL}
+.if defined(DESTLABEL)
+  DESTKERNNAME?=${KERNEL}.${DESTLABEL}
+  DESTMODULESNAME?=modules.${DESTLABEL}
+.else
+  DESTKERNNAME?=${KERNEL}
+  DESTMODULESNAME?=modules
+.endif
+DESTKERNDIR?=/boot
 
 
-MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR} BUILDING_WITH_KERNEL=${.OBJDIR}
+MKMODULESENV=	DESTKERNDIR=${DESTKERNDIR} DESTMODULESNAME=${DESTMODULESNAME} MAKEOBJDIRPREFIX=${.OBJDIR} BUILDING_WITH_KERNEL=${.OBJDIR}
 .if defined(MODULES_OVERRIDE)
 MKMODULESENV+=	MODULES_OVERRIDE="${MODULES_OVERRIDE}"
 .endif