diff -r c0b11789d01c Makefile
--- a/Makefile	Wed May 25 14:57:07 2011 +0300
+++ b/Makefile	Wed May 25 10:53:12 2011 -0300
@@ -50,8 +50,9 @@
 
 
 # Generate kernel config file
-KERNEL_HINTS_FILE?=${KERNELCONFDIR}/${TARGET_VENDOR}_${TARGET_DEVICE}.hints
-KERNEL_CONFIG_FILE?=${KERNELCONFDIR}/${TARGET_VENDOR}_${TARGET_DEVICE}
+KERNEL_CONFIG_NAME=${TARGET_VENDOR}_${TARGET_DEVICE}
+KERNEL_HINTS_FILE?=${KERNELCONFDIR}/${KERNEL_CONFIG_NAME}.hints
+KERNEL_CONFIG_FILE?=${KERNELCONFDIR}/${KERNEL_CONFIG_NAME}
 
 kernelconfig:	${TARGET_SOCDIR}/${SOC_KERNCONF} ${KERNELCONFDIR}
 	echo "# Kernel config for ${SOC_CHIP} on ${TARGET_VENDOR} ${TARGET_DEVICE} board" > ${KERNEL_CONFIG_FILE}
@@ -116,7 +117,7 @@
 ${ZROUTER_OBJ}/tmp/${TARGET}.${TARGET_ARCH}/${FREEBSD_SRC_TREE}/tmp/usr/bin/cc:	kernel-toolchain
 
 kernel-build:	kernelconfig kernelhints ${ZROUTER_OBJ}/tmp/${TARGET}.${TARGET_ARCH}/${FREEBSD_SRC_TREE}/tmp/usr/bin/cc
-	MAKEOBJDIRPREFIX=${ZROUTER_OBJ}/tmp/ ${MAKE} ${_KERNEL_BUILD_ENV} -C ${FREEBSD_SRC_TREE} KERNCONF=${KERNEL_CONFIG_FILE} buildkernel
+	MAKEOBJDIRPREFIX=${ZROUTER_OBJ}/tmp/ ${MAKE} ${_KERNEL_BUILD_ENV} -C ${FREEBSD_SRC_TREE} KERNCONFDIR=${KERNELCONFDIR} KERNCONF=${KERNEL_CONFIG_NAME} buildkernel
 
 #XXX_BEGIN Only for testing
 KMODOWN!=id -u -n
@@ -415,7 +416,7 @@
 ${KERNELDESTDIR}/boot/kernel/kernel:	${ZROUTER_OBJ}/tmp/${TARGET}.${TARGET_ARCH}/${FREEBSD_SRC_TREE}/sys/${KERNEL_CONFIG_FILE}/kernel kernel-install-dir
 	@echo "++++++++++++++ Making $@ ++++++++++++++"
 .if !empty(KERNELDESTDIR)
-	MAKEOBJDIRPREFIX=${ZROUTER_OBJ}/tmp/ ${MAKE} ${_KERNEL_BUILD_ENV} -C ${FREEBSD_SRC_TREE} DESTDIR=${KERNELDESTDIR} KERNCONF=${KERNEL_CONFIG_FILE} installkernel
+	MAKEOBJDIRPREFIX=${ZROUTER_OBJ}/tmp/ ${MAKE} ${_KERNEL_BUILD_ENV} -C ${FREEBSD_SRC_TREE} DESTDIR=${KERNELDESTDIR} KERNCONFDIR=${KERNELCONFDIR} KERNCONF=${KERNEL_CONFIG_NAME} installkernel
 .else
 .error "KERNELDESTDIR must be set for kernel-install, since we always do cross-build"
 .endif