--- elwix/build_world.sh	2012/02/16 23:18:47	1.1.1.1.6.1
+++ 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.1 2012/02/16 23:18:47 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()
@@ -75,22 +81,27 @@ build_cross()
 #
 # Create auto cross build env script
 #
+export \\
 _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}
 	cp ${CENV} ${CGBUILD}
+	cp ${CENV} ${CEXEC}
 	cat >>${CBUILD} <<_EOF
 make \$*
 _EOF
 	cat >>${CGBUILD} <<_EOF
 gmake \$*
 _EOF
-	chmod +x ${CBUILD} ${CGBUILD} ${CENV}
+	cat >>${CEXEC} <<_EOF
+eval \$*
+_EOF
+	chmod +x ${CBUILD} ${CGBUILD} ${CEXEC} ${CENV}
 	echo "Done."
 }
 
@@ -104,6 +115,5 @@ if ! SnitVer ${WORLD}/elwix.ver; then
 else
 	echo "Skipped ELWIX World build ..."
 fi
-
 
 echo "+++ Complete build ELWIX World"