--- elwix/build_world.sh	2014/01/15 09:09:44	1.3.2.3
+++ elwix/build_world.sh	2014/09/15 19:06:42	1.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.3.2.3 2014/01/15 09:09:44 misho Exp $
+# $Id: build_world.sh,v 1.4 2014/09/15 19:06:42 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -38,7 +38,7 @@ if [ "${USER}" != "root" ]; then
 fi
 
 # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
-X_TARGET_CPUTYPE="${TARGET_CPUTYPE}"
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
 
 clean_world()
 {
@@ -112,6 +112,11 @@ _EOF
 		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
+
+if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then
+	MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"
+fi
+
 _EOF
 	cd -
 	cp ${CENV} ${CBUILD}