--- elwix/build_world.sh	2012/03/20 15:07:40	1.1.1.1.6.2
+++ elwix/build_world.sh	2012/04/18 15:44:30	1.1.1.1.6.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_world.sh,v 1.1.1.1.6.2 2012/03/20 15:07:40 misho Exp $
+# $Id: build_world.sh,v 1.1.1.1.6.4 2012/04/18 15:44:30 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -52,7 +52,11 @@ build_world()
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-j${PARALLEL_BUILD} buildworld DESTDIR=${WORLD}
-	cd -
+	if ! $?; then
+		exit 1
+	else
+		cd -
+	fi
 }
 
 install_world()
@@ -63,7 +67,9 @@ install_world()
 		installworld DESTDIR=${WORLD}
 	cd -
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix.ver
+	if $?; then
+		echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix.ver
+	fi
 }
 
 build_cross()
@@ -80,7 +86,7 @@ _EOF
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		buildenvvars >> ${CENV}
 	cat >>${CENV} <<_EOF
-PATH=$PKG/bin:$PKG/sbin:\$PATH:$PATH
+PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH
 _EOF
 	cd -
 	cp ${CENV} ${CBUILD}