--- elwix/build_world.sh	2014/01/05 23:14:22	1.3
+++ elwix/build_world.sh	2014/01/14 14:25:23	1.3.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_world.sh,v 1.3 2014/01/05 23:14:22 misho Exp $
+# $Id: build_world.sh,v 1.3.2.1 2014/01/14 14:25:23 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -52,8 +52,7 @@ build_toolchain()
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} \
-		DESTDIR=${WORLD} toolchain
+		SRCCONF=${SRCCONF} DESTDIR=${WORLD} toolchain
 	if [ $? -eq 0 ]; then
 		cd -
 	else
@@ -68,11 +67,11 @@ build_world()
 	if [ -z "$1" ]; then
 		env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
 			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-			MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} buildworld
+			SRCCONF=${SRCCONF} buildworld
 	else
 		env MAKEOBJDIRPREFIX=${BSDOBJ} NO_CLEAN="YES" make ${PARALLEL_BUILD} \
 			TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-			MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} buildworld
+			SRCCONF=${SRCCONF} buildworld
 	fi
 	if [ $? -eq 0 ]; then
 		cd -
@@ -87,7 +86,7 @@ install_world()
 	cd $BSDSRC
 	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} DESTDIR=${WORLD} installworld
+		SRCCONF=${SRCCONF} DESTDIR=${WORLD} installworld
 	cd -
 
 	if [ $? -eq 0 ]; then
@@ -106,8 +105,8 @@ build_cross()
 #
 export \\
 _EOF
-	make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MAKEOBJDIRPREFIX=${BSDOBJ} buildenvvars >> ${CENV}
+	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		buildenvvars >> ${CENV}
 	cat >>${CENV} <<_EOF
 PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH
 _EOF