--- elwix/build_rootfs.sh	2014/01/17 01:11:52	1.8.2.3
+++ elwix/build_rootfs.sh	2014/01/17 11:23:12	1.8.2.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.8.2.3 2014/01/17 01:11:52 misho Exp $
+# $Id: build_rootfs.sh,v 1.8.2.4 2014/01/17 11:23:12 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -74,13 +74,14 @@ srcdirs ${BSDSRC}/bin ${BSDSRC}/sbin ${BSDSRC}/libexec
 srcdirs ${BSDSRC}/usr.bin ${BSDSRC}/usr.sbin ${BSDSRC}/usr.sbin/wpa
 srcdirs ${BSDSRC}/secure/usr.bin ${BSDSRC}/secure/usr.sbin ${BSDSRC}/secure/libexec
 
-buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes
 buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
+buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes
 _EOF
 	cat $CFGDIR/$ROOTFS_CONF >>$ROOTFS_CONF
 
 	install -d ${BSDOBJ}/elwix
-	crunchgen -f -o -p ${BSDOBJ}/elwix -h $ROOTFS_MKDIR/$MKH -m $MKF \
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix crunchgen -f \
+		-h $ROOTFS_MKDIR/$MKH -m $MKF \
 		-c elwix.c -e elwix $ROOTFS_CONF
 	cd -
 }
@@ -89,10 +90,10 @@ build_elwix()
 {
 	echo "+++ Build ELWIX RootFS firmware ..."
 	cd $ROOTFS_MKDIR
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CBUILD} -f $MKF \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CBUILD} -f $MKF \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 	if [ $? -ne 0 ]; then