--- elwix/build_tools.sh	2014/09/15 19:06:42	1.7
+++ elwix/build_tools.sh	2014/09/17 15:33:21	1.7.2.1
@@ -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.1 2014/09/17 15:33:21 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -120,6 +120,12 @@ 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}
@@ -128,13 +134,13 @@ compile_fbsdtools()
 
 	cd $CROSS_FT_ATH
 	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}"
 	${CBUILD} DESTDIR=${WORLD} install
 	cd -
 
 	cd $CROSS_FT_NET80211/wlanstats
 	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}"
 	${CBUILD} DESTDIR=${WORLD} install
 	cd -
 
@@ -152,7 +158,7 @@ compile_fbsdtools()
 
 	cd $CROSS_FT_MWL
 	${CBUILD} DESTDIR=${WORLD} clean
-	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDSTATDIR}"
 	${CBUILD} DESTDIR=${WORLD} install
 	cd -
 }