--- elwix/build_tools.sh	2014/09/15 19:06:42	1.7
+++ elwix/build_tools.sh	2015/05/19 23:35:40	1.7.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.7 2014/09/15 19:06:42 misho Exp $
+# $Id: build_tools.sh,v 1.7.2.2 2015/05/19 23:35:40 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -120,64 +120,65 @@ compile_fbsdtools()
 {
 	echo "+++ Compile ELWIX FreeBSD tools ..."
 
+	if [ "$(uname -m)" != ${TARGET} ]; then
+		BSDSTATDIR="${BSDOBJ}/${TARGET}.${TARGET_ARCH}${BSDSRC}/lib/libbsdstat"
+	else
+		BSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	fi
+
 	cd $CROSS_FT_VIMAGE
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD}
-	${CBUILD} DESTDIR=${WORLD} install
+	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+	${CBUILD} DESTDIR=${WORLD} || exit 1
+	${CBUILD} DESTDIR=${WORLD} install || exit 1
 	cd -
 
 	cd $CROSS_FT_ATH
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
-	${CBUILD} DESTDIR=${WORLD} install
+	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+	cp ${CROSSTOOLDIR}/usr/include/private/bsdstat/bsdstat.h ${BSDTOOLS}/ath/common || exit 1
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}" || exit 1
+	${CBUILD} DESTDIR=${WORLD} install || exit 1
 	cd -
 
-	cd $CROSS_FT_NET80211/wlanstats
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
-	${CBUILD} DESTDIR=${WORLD} install
-	cd -
+#	cd $CROSS_FT_NET80211/wlanstats
+#	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+#	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}" || exit 1
+#	${CBUILD} DESTDIR=${WORLD} install || exit 1
+#	cd -
 
 	cd $CROSS_FT_IPW
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD}
-	${CBUILD} DESTDIR=${WORLD}/usr/local/bin install
+	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+	${CBUILD} DESTDIR=${WORLD} || exit 1
+	${CBUILD} DESTDIR=${WORLD}/usr/local/bin install || exit 1
 	cd -
 
 	cd $CROSS_FT_IWI
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD}
-	${CBUILD} DESTDIR=${WORLD}/usr/local/bin install
+	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+	${CBUILD} DESTDIR=${WORLD} || exit 1
+	${CBUILD} DESTDIR=${WORLD}/usr/local/bin install || exit 1
 	cd -
 
 	cd $CROSS_FT_MWL
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
-	${CBUILD} DESTDIR=${WORLD} install
+	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+	cp ${CROSSTOOLDIR}/usr/include/private/bsdstat/bsdstat.h ${BSDTOOLS}/mwl/mwlstats || exit 1
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}" || exit 1
+	${CBUILD} DESTDIR=${WORLD} install || exit 1
 	cd -
 }
 
 compile_files()
 {
 	cd files
-	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} obj
-	${CBUILD} DESTDIR=${WORLD} depend 
-	${CBUILD} DESTDIR=${WORLD}
-	${CBUILD} DESTDIR=${WORLD} install 
+	${CBUILD} DESTDIR=${WORLD} clean || exit 1
+	${CBUILD} DESTDIR=${WORLD} obj || exit 1
+	${CBUILD} DESTDIR=${WORLD} depend || exit 1
+	${CBUILD} DESTDIR=${WORLD} || exit 1
+	${CBUILD} DESTDIR=${WORLD} install || exit 1
 	cd -
 }
 
 compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
-
-#	cd $CROSS_AXL
-#	${AXL_CFG}
-#	${CBUILD} clean
-#	${CBUILD}
-#	${CBUILD} install
-#	cd -
 
 	cd $CROSS_ELWIX
 	${ELWIX_CFG}