--- elwix/build_kernel.sh	2011/10/20 11:28:32	1.1.1.1.4.1
+++ elwix/build_kernel.sh	2013/07/17 14:37:38	1.3.6.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_kernel.sh,v 1.1.1.1.4.1 2011/10/20 11:28:32 misho Exp $
+# $Id: build_kernel.sh,v 1.3.6.1 2013/07/17 14:37:38 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -36,7 +36,8 @@ clean_kernel()
 	rm -rf $KERN
 	mkdir -p $KERN
 
-	ln -sf $(pwd)/config/${KERNCONF} ${BSDKERNCONF}
+	ln -sf ${CFGDIR}/${KERNCONF} ${BSDKERNCONF}
+	ln -sf ${CFGDIR}/${KERNHINT:=$KERNCONF.hints} ${BSDKERNCONF}
 }
 
 build_kernel()
@@ -45,10 +46,10 @@ build_kernel()
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-j${PARALLEL_BUILD} buildkernel KERNCONF=${KERNCONF} DESTDIR=${KERN}
-	if [ $? -ne 0 ]; then
-		exit 1
-	else
+	if [ $? -eq 0 ]; then
 		cd -
+	else
+		exit 1
 	fi
 }
 
@@ -60,13 +61,16 @@ install_kernel()
 		installkernel KERNCONF=${KERNCONF} DESTDIR=${KERN}
 	cd -
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${KERN}/elwix.ver
+	if [ $? -eq 0 ]; then
+		echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${KERN}/elwix.ver
+	fi
 }
 
 ### main()
 if ! SnitVer ${KERN}/elwix.ver; then
 	clean_kernel
-	build_kernel && install_kernel
+	build_kernel
+	install_kernel
 else
 	echo "Skipped ELWIX Kernel build ..."
 fi