--- elwix/build_rootfs.sh	2016/11/21 17:25:33	1.9.2.2
+++ elwix/build_rootfs.sh	2017/06/29 08:45:14	1.10.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.9.2.2 2016/11/21 17:25:33 misho Exp $
+# $Id: build_rootfs.sh,v 1.10.2.2 2017/06/29 08:45:14 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -82,7 +82,7 @@ _EOF
 	echo "+++ Prepared RootFS config ... $CFGDIR/$ROOTFS_CONF"
 
 	install -d ${BSDOBJ}/elwix
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix crunchgen -f \
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CEXEC} crunchgen -f \
 		-h $ROOTFS_MKDIR/$MKH -m $MKF \
 		-c elwix.c -e elwix $ROOTFS_CONF
 	if [ $? -ne 0 ]; then
@@ -95,11 +95,14 @@ build_elwix()
 {
 	echo "+++ Build ELWIX RootFS firmware ... $ROOTFS_MKDIR"
 	cd $ROOTFS_MKDIR
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
+	${CBUILD} -f $MKF \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
+	${CBUILD} -f $MKF \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} objs
+	${CBUILD} -f $MKF \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 	if [ $? -ne 0 ]; then
 		exit 1
@@ -115,7 +118,7 @@ build_rootdir()
 	install -d bin;
 	install -d dev;
 	install -d elwix;
-	install -d elwix/etc;
+	install -d etc;
 	install -d libexec;
 	install -d mnt;
 	install -d -m 0555 proc;
@@ -131,7 +134,7 @@ build_rootdir()
 
 	ln -fs /usr/lib lib;
 
-	ln -fs /elwix/etc etc;
+	ln -fs /elwix/boot boot;
 	ln -fs /elwix/exports exports;
 	ln -fs /elwix/home home;
 	ln -fs /elwix/root root;
@@ -146,7 +149,7 @@ install_rootfs()
 	SBIN="${ROOTFS}/sbin"
 	UBIN="${ROOTFS}/usr/bin"
 	LIBEXEC="${ROOTFS}/usr/libexec"
-	ETC="${ROOTFS}/elwix/etc"
+	ETC="${ROOTFS}/etc"
 
 	PRG="/sbin/elwix"
 	LNPRG="${SBIN}/elwix"
@@ -379,7 +382,6 @@ install_rootfs()
 
 	echo "+++ ELWIX clean CVS tags ..."
 	CleanCVS $ETC
-	CleanCVS $ETC/etc
 	echo
 }