Build system: replace TOOLS_BUILD -> embtk_toolsb

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

22 files changed, 44 insertions, 44 deletions

diff --git a/mk/autoconf.mk b/mk/autoconf.mk
index 421ec4b..942a3e0 100644
--- a/mk/autoconf.mk
+++ b/mk/autoconf.mk
@@ -27,8 +27,8 @@ AUTOCONF_NAME		:= autoconf
 AUTOCONF_VERSION	:= $(call embtk_get_pkgversion,autoconf)
 AUTOCONF_SITE		:= http://ftp.gnu.org/gnu/autoconf
 AUTOCONF_PACKAGE	:= autoconf-$(AUTOCONF_VERSION).tar.bz2
-AUTOCONF_SRC_DIR	:= $(TOOLS_BUILD)/autoconf-$(AUTOCONF_VERSION)
-AUTOCONF_BUILD_DIR	:= $(TOOLS_BUILD)/autoconf-$(AUTOCONF_VERSION)
+AUTOCONF_SRC_DIR	:= $(embtk_toolsb)/autoconf-$(AUTOCONF_VERSION)
+AUTOCONF_BUILD_DIR	:= $(embtk_toolsb)/autoconf-$(AUTOCONF_VERSION)
 
 # autoconf binaries
 AUTOCONF_DIR	:= $(HOSTTOOLS)/usr
diff --git a/mk/automake.mk b/mk/automake.mk
index 245ec0d..6d32406 100644
--- a/mk/automake.mk
+++ b/mk/automake.mk
@@ -27,8 +27,8 @@ AUTOMAKE_NAME		:= automake
 AUTOMAKE_VERSION	:= $(call embtk_get_pkgversion,AUTOMAKE)
 AUTOMAKE_SITE		:= http://ftp.gnu.org/gnu/automake
 AUTOMAKE_PACKAGE	:= automake-$(AUTOMAKE_VERSION).tar.xz
-AUTOMAKE_SRC_DIR	:= $(TOOLS_BUILD)/automake-$(AUTOMAKE_VERSION)
-AUTOMAKE_BUILD_DIR	:= $(TOOLS_BUILD)/automake-$(AUTOMAKE_VERSION)
+AUTOMAKE_SRC_DIR	:= $(embtk_toolsb)/automake-$(AUTOMAKE_VERSION)
+AUTOMAKE_BUILD_DIR	:= $(embtk_toolsb)/automake-$(AUTOMAKE_VERSION)
 
 AUTOMAKE_DIR	:= $(HOSTTOOLS)/usr
 ACLOCAL		:= $(AUTOMAKE_DIR)/bin/aclocal
diff --git a/mk/binutils.mk b/mk/binutils.mk
index e06efa3..7c0f43f 100644
--- a/mk/binutils.mk
+++ b/mk/binutils.mk
@@ -28,8 +28,8 @@ BINUTILS_VERSION	:= $(call embtk_get_pkgversion,binutils)
 BINUTILS_SITE		:= http://ftp.gnu.org/gnu/binutils
 BINUTILS_GIT_SITE	:= git://sourceware.org/git/binutils.git
 BINUTILS_PACKAGE	:= binutils-$(BINUTILS_VERSION).tar.bz2
-BINUTILS_SRC_DIR	:= $(TOOLS_BUILD)/binutils-$(BINUTILS_VERSION)
-BINUTILS_BUILD_DIR	:= $(TOOLS_BUILD)/binutils-build
+BINUTILS_SRC_DIR	:= $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)
+BINUTILS_BUILD_DIR	:= $(embtk_toolsb)/binutils-build
 
 BINUTILS_CONFIGURE_OPTS	:= --with-sysroot=$(embtk_sysroot) --disable-werror	\
 			--disable-nls --disable-multilib		\
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk
index d515321..ea3cc67 100644
--- a/mk/buildsystem.mk
+++ b/mk/buildsystem.mk
@@ -39,7 +39,7 @@ J			:= -j$(CONFIG_EMBTK_NUMBER_BUILD_JOBS)
 #
 embtk_sysroot		:= $(SYSROOT)
 embtk_tools		:= $(TOOLS)
-embtk_toolsbuild	:= $(TOOLS_BUILD)
+embtk_toolsb		:= $(TOOLS_BUILD)
 embtk_pkgbuild		:= $(PACKAGES_BUILD)
 embtk_generated		:= $(EMBTK_GENERATED)
 embtk_rootfs		:= $(ROOTFS)
@@ -143,7 +143,7 @@ endef
 
 define __embtk_mk_inittoolsdirs
 	mkdir -p $(embtk_tools)
-	mkdir -p $(TOOLS_BUILD)
+	mkdir -p $(embtk_toolsb)
 endef
 
 define __embtk_mk_inithosttoolsdirs
@@ -174,6 +174,6 @@ define __embtk_kconfig_clean
 endef
 
 rmallpath:
-	$(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(embtk_tools)* $(TOOLS_BUILD)*
+	$(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(embtk_tools)* $(embtk_toolsb)*
 	$(Q)rm -rf $(embtk_sysroot)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-*
 	$(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch)
diff --git a/mk/ccache.mk b/mk/ccache.mk
index e4d8edb..3a05374 100644
--- a/mk/ccache.mk
+++ b/mk/ccache.mk
@@ -32,8 +32,8 @@ CCACHE_SITE		:= http://samba.org/ftp/ccache
 CCACHE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 CCACHE_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/ccache/$(CCACHE_VERSION)
 CCACHE_PACKAGE		:= ccache-$(CCACHE_VERSION).tar.bz2
-CCACHE_SRC_DIR		:= $(TOOLS_BUILD)/ccache-$(CCACHE_VERSION)
-CCACHE_BUILD_DIR	:= $(TOOLS_BUILD)/ccachehost-build
+CCACHE_SRC_DIR		:= $(embtk_toolsb)/ccache-$(CCACHE_VERSION)
+CCACHE_BUILD_DIR	:= $(embtk_toolsb)/ccachehost-build
 
 CCACHE_HOST_DIR		:= $(HOSTTOOLS)/usr/local/ccachehost
 CCACHE_DIR		:= $(EMBTK_ROOT)/.ccache
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index 832496d..5204505 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -27,9 +27,9 @@ EGLIBC_NAME			:= eglibc
 EGLIBC_HEADERS_NAME		:= eglibc_headers
 EGLIBC_VERSION			:= $(call embtk_get_pkgversion,eglibc)
 EGLIBC_SVN_SITE			:= http://www.eglibc.org/svn
-EGLIBC_BUILD_DIR 		:= $(TOOLS_BUILD)/eglibc
+EGLIBC_BUILD_DIR 		:= $(embtk_toolsb)/eglibc
 EGLIBC_SRC_DIR			:= $(call __embtk_pkg_localsvn,eglibc)
-EGLIBC_HEADERS_BUILD_DIR	:= $(TOOLS_BUILD)/eglibc-headers
+EGLIBC_HEADERS_BUILD_DIR	:= $(embtk_toolsb)/eglibc-headers
 EGLIBC_HEADERS_SRC_DIR		:= $(call __embtk_pkg_localsvn,eglibc)
 EGLIBC_HEADERS_KCONFIGS_NAME	:= EGLIBC
 
diff --git a/mk/fakeroot.mk b/mk/fakeroot.mk
index 0130b79..f509a09 100644
--- a/mk/fakeroot.mk
+++ b/mk/fakeroot.mk
@@ -29,8 +29,8 @@ FAKEROOT_VERSION	:= $(call embtk_get_pkgversion,fakeroot)
 FAKEROOT_SITE		:= http://ftp.debian.org/debian/pool/main/f/fakeroot
 FAKEROOT_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FAKEROOT_PACKAGE	:= fakeroot_$(FAKEROOT_VERSION).tar.gz
-FAKEROOT_SRC_DIR	:= $(TOOLS_BUILD)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_BUILD_DIR	:= $(TOOLS_BUILD)/fakeroot-build
+FAKEROOT_SRC_DIR	:= $(embtk_toolsb)/fakeroot-$(FAKEROOT_VERSION)
+FAKEROOT_BUILD_DIR	:= $(embtk_toolsb)/fakeroot-build
 
 # fakeroot binaries and env
 FAKEROOT_BIN		:= $(HOSTTOOLS)/usr/bin/fakeroot
diff --git a/mk/gcc.mk b/mk/gcc.mk
index 45f5d99..d9f13cf 100644
--- a/mk/gcc.mk
+++ b/mk/gcc.mk
@@ -28,7 +28,7 @@ GCC_VERSION	:= $(call embtk_get_pkgversion,gcc)
 GCC_SITE	:= http://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VERSION)
 GCC_GIT_SITE	:= git://gcc.gnu.org/git/gcc.git
 GCC_PACKAGE	:= gcc-$(GCC_VERSION).tar.bz2
-GCC_SRC_DIR	:= $(TOOLS_BUILD)/gcc-$(GCC_VERSION)
+GCC_SRC_DIR	:= $(embtk_toolsb)/gcc-$(GCC_VERSION)
 
 GCC_MULTILIB	:= --disable-multilib
 
@@ -70,7 +70,7 @@ GCC1_SITE		:= $(GCC_SITE)
 GCC1_GIT_SITE		:= $(GCC_GIT_SITE)
 GCC1_PACKAGE		:= $(GCC_PACKAGE)
 GCC1_SRC_DIR		:= $(GCC_SRC_DIR)
-GCC1_BUILD_DIR		:= $(TOOLS_BUILD)/gcc1-build
+GCC1_BUILD_DIR		:= $(embtk_toolsb)/gcc1-build
 GCC1_KCONFIGS_NAME	:= GCC
 
 GCC1_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
@@ -98,7 +98,7 @@ GCC2_SITE		:= $(GCC_SITE)
 GCC2_GIT_SITE		:= $(GCC_GIT_SITE)
 GCC2_PACKAGE		:= $(GCC_PACKAGE)
 GCC2_SRC_DIR		:= $(GCC_SRC_DIR)
-GCC2_BUILD_DIR		:= $(TOOLS_BUILD)/gcc2-build
+GCC2_BUILD_DIR		:= $(embtk_toolsb)/gcc2-build
 GCC2_KCONFIGS_NAME	:= GCC
 
 GCC2_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
@@ -125,7 +125,7 @@ GCC3_SITE		:= $(GCC_SITE)
 GCC3_GIT_SITE		:= $(GCC_GIT_SITE)
 GCC3_PACKAGE		:= $(GCC_PACKAGE)
 GCC3_SRC_DIR		:= $(GCC_SRC_DIR)
-GCC3_BUILD_DIR		:= $(TOOLS_BUILD)/gcc3-build
+GCC3_BUILD_DIR		:= $(embtk_toolsb)/gcc3-build
 GCC3_KCONFIGS_NAME	:= GCC
 
 GCC3_MAKE_ENV		:= PATH=$(PATH):$(embtk_tools)/bin
diff --git a/mk/gmp.mk b/mk/gmp.mk
index a10bea1..8b0159f 100644
--- a/mk/gmp.mk
+++ b/mk/gmp.mk
@@ -27,8 +27,8 @@ GMP_HOST_NAME		:= gmp
 GMP_HOST_VERSION	:= $(call embtk_get_pkgversion,gmp_host)
 GMP_HOST_SITE		:= ftp://ftp.gmplib.org/pub/gmp-$(GMP_HOST_VERSION)
 GMP_HOST_PACKAGE	:= gmp-$(GMP_HOST_VERSION).tar.bz2
-GMP_HOST_SRC_DIR	:= $(TOOLS_BUILD)/gmp-$(GMP_HOST_VERSION)
-GMP_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gmp-build
+GMP_HOST_SRC_DIR	:= $(embtk_toolsb)/gmp-$(GMP_HOST_VERSION)
+GMP_HOST_BUILD_DIR	:= $(embtk_toolsb)/gmp-build
 GMP_HOST_DIR		:= $(HOSTTOOLS)/usr/local/gmp-host
 
 export GMP_HOST_DIR
diff --git a/mk/gperf_host.mk b/mk/gperf_host.mk
index b995ab5..954aef3 100644
--- a/mk/gperf_host.mk
+++ b/mk/gperf_host.mk
@@ -27,8 +27,8 @@ GPERF_HOST_NAME		:= gperf
 GPERF_HOST_VERSION	:= $(call embtk_get_pkgversion,gperf_host)
 GPERF_HOST_SITE		:= http://ftp.gnu.org/gnu/gperf
 GPERF_HOST_PACKAGE	:= gperf-$(GPERF_HOST_VERSION).tar.gz
-GPERF_HOST_SRC_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_HOST_VERSION)
-GPERF_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/gperf-$(GPERF_HOST_VERSION)
+GPERF_HOST_SRC_DIR	:= $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION)
+GPERF_HOST_BUILD_DIR	:= $(embtk_toolsb)/gperf-$(GPERF_HOST_VERSION)
 
 gperf_host_clean:
 	$(Q)rm -rf $(GPERF_HOST_BUILD_DIR)
diff --git a/mk/libtool.mk b/mk/libtool.mk
index 93f70e9..0b71c1a 100644
--- a/mk/libtool.mk
+++ b/mk/libtool.mk
@@ -27,8 +27,8 @@ LIBTOOL_NAME		:= libtool
 LIBTOOL_VERSION		:= $(call embtk_get_pkgversion,libtool)
 LIBTOOL_SITE		:= http://ftp.gnu.org/gnu/libtool
 LIBTOOL_PACKAGE		:= libtool-$(LIBTOOL_VERSION).tar.gz
-LIBTOOL_SRC_DIR		:= $(TOOLS_BUILD)/libtool-$(LIBTOOL_VERSION)
-LIBTOOL_BUILD_DIR	:= $(TOOLS_BUILD)/libtool-$(LIBTOOL_VERSION)
+LIBTOOL_SRC_DIR		:= $(embtk_toolsb)/libtool-$(LIBTOOL_VERSION)
+LIBTOOL_BUILD_DIR	:= $(embtk_toolsb)/libtool-$(LIBTOOL_VERSION)
 
 LIBTOOL			:= $(HOSTTOOLS)/usr/bin/libtool
 LIBTOOLIZE		:= $(HOSTTOOLS)/usr/bin/libtoolize
diff --git a/mk/linux.mk b/mk/linux.mk
index c002751..dc226e6 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -36,8 +36,8 @@ LINUX_LONGTERMV		:= $(call embtk_get_pkgversion,linux_longterm)
 LINUX_VERSION		:= $(call embtk_get_pkgversion,linux)
 LINUX_SITE		:= $(call __LINUX_SITE)
 LINUX_PACKAGE		:= linux-$(LINUX_VERSION).tar.bz2
-LINUX_SRC_DIR		:= $(TOOLS_BUILD)/linux-$(LINUX_VERSION)
-LINUX_BUILD_DIR		:= $(TOOLS_BUILD)/linux-$(LINUX_VERSION)
+LINUX_SRC_DIR		:= $(embtk_toolsb)/linux-$(LINUX_VERSION)
+LINUX_BUILD_DIR		:= $(embtk_toolsb)/linux-$(LINUX_VERSION)
 LINUX_HEADERS_KCONFIGS_NAME := LINUX
 
 linux_headers_install:
diff --git a/mk/m4.mk b/mk/m4.mk
index ffb59a2..fd1b3e3 100644
--- a/mk/m4.mk
+++ b/mk/m4.mk
@@ -28,8 +28,8 @@ M4_VERSION	:= $(call embtk_get_pkgversion,m4)
 M4_SITE		:= http://ftp.gnu.org/gnu/m4
 M4_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 M4_PACKAGE	:= m4-$(M4_VERSION).tar.bz2
-M4_SRC_DIR	:= $(TOOLS_BUILD)/m4-$(M4_VERSION)
-M4_BUILD_DIR	:= $(TOOLS_BUILD)/m4-$(M4_VERSION)
+M4_SRC_DIR	:= $(embtk_toolsb)/m4-$(M4_VERSION)
+M4_BUILD_DIR	:= $(embtk_toolsb)/m4-$(M4_VERSION)
 
 # m4 binaries
 M4_DIR	:= $(HOSTTOOLS)/usr
diff --git a/mk/makedevs.mk b/mk/makedevs.mk
index 681d69b..75f302b 100644
--- a/mk/makedevs.mk
+++ b/mk/makedevs.mk
@@ -23,7 +23,7 @@
 #########################################################################################
 
 MAKEDEVS_NAME		:= makedevs
-MAKEDEVS_BUILD_DIR	:= $(TOOLS_BUILD)/makedevs-build
+MAKEDEVS_BUILD_DIR	:= $(embtk_toolsb)/makedevs-build
 MAKEDEVS_SRC		:= $(EMBTK_ROOT)/src/makedevs
 
 MAKEDEVS_DIR		:= $(HOSTTOOLS)/usr/bin
diff --git a/mk/mkimage.mk b/mk/mkimage.mk
index 742fed8..551e3db 100644
--- a/mk/mkimage.mk
+++ b/mk/mkimage.mk
@@ -27,7 +27,7 @@
 MAKEIMAGE_VERSION := 0.4
 MAKEIMAGE_SITE := http://ftp.debian.org/debian/pool/main/u/uboot-mkimage
 MAKEIMAGE_PACKAGE :=
-MAKEIMAGE_BUILD_DIR := $(TOOLS_BUILD)/mkimage
+MAKEIMAGE_BUILD_DIR := $(embtk_toolsb)/mkimage
 MAKEIMAGE_BIN := $(HOSTTOOLS)/usr/bin/mkimage
 export MAKEIMAGE_BIN
 
@@ -36,7 +36,7 @@ mkimage_install:
 	$(MAKE) $(MAKEIMAGE_BUILD_DIR)/.installed
 
 $(MAKEIMAGE_BUILD_DIR)/.installed: zlib_host_install
-	$(Q)cp -R $(EMBTK_ROOT)/src/mkimage $(TOOLS_BUILD)/
+	$(Q)cp -R $(EMBTK_ROOT)/src/mkimage $(embtk_toolsb)/
 	$(MAKE) -C $(MAKEIMAGE_BUILD_DIR) CPPFLAGS="-I$(HOSTTOOLS)/usr/include"
 	$(MAKE) -C $(MAKEIMAGE_BUILD_DIR) DESTDIR=$(HOSTTOOLS) install
 	@touch $@
diff --git a/mk/mpc.mk b/mk/mpc.mk
index 5a69dc6..7fd4a39 100644
--- a/mk/mpc.mk
+++ b/mk/mpc.mk
@@ -27,8 +27,8 @@ MPC_HOST_NAME		:= mpc
 MPC_HOST_VERSION	:= $(call embtk_get_pkgversion,mpc_host)
 MPC_HOST_SITE		:= http://www.multiprecision.org/mpc/download
 MPC_HOST_PACKAGE	:= mpc-$(MPC_HOST_VERSION).tar.gz
-MPC_HOST_SRC_DIR	:= $(TOOLS_BUILD)/mpc-$(MPC_HOST_VERSION)
-MPC_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/mpc-build
+MPC_HOST_SRC_DIR	:= $(embtk_toolsb)/mpc-$(MPC_HOST_VERSION)
+MPC_HOST_BUILD_DIR	:= $(embtk_toolsb)/mpc-build
 MPC_HOST_DIR		:= $(HOSTTOOLS)/usr/local/mpc-host
 
 export MPC_HOST_DIR
diff --git a/mk/mpfr.mk b/mk/mpfr.mk
index 5b908f2..0a26a8d 100644
--- a/mk/mpfr.mk
+++ b/mk/mpfr.mk
@@ -27,8 +27,8 @@ MPFR_HOST_NAME		:= mpfr
 MPFR_HOST_VERSION	:= $(call embtk_get_pkgversion,mpfr_host)
 MPFR_HOST_SITE		:= http://www.mpfr.org/mpfr-$(MPFR_HOST_VERSION)
 MPFR_HOST_PACKAGE	:= mpfr-$(MPFR_HOST_VERSION).tar.bz2
-MPFR_HOST_SRC_DIR	:= $(TOOLS_BUILD)/mpfr-$(MPFR_HOST_VERSION)
-MPFR_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/mpfr-build
+MPFR_HOST_SRC_DIR	:= $(embtk_toolsb)/mpfr-$(MPFR_HOST_VERSION)
+MPFR_HOST_BUILD_DIR	:= $(embtk_toolsb)/mpfr-build
 MPFR_HOST_DIR		:= $(HOSTTOOLS)/usr/local/mpfr-host
 
 export MPFR_HOST_DIR
diff --git a/mk/mtd-utils.mk b/mk/mtd-utils.mk
index bbda650..04bbc49 100644
--- a/mk/mtd-utils.mk
+++ b/mk/mtd-utils.mk
@@ -66,8 +66,8 @@ MTDUTILS_HOST_SITE_MIRROR1	:= $(MTDUTILS_SITE_MIRROR1)
 MTDUTILS_SITE_MIRROR2		:= $(MTDUTILS_SITE_MIRROR2)
 MTDUTILS_HOST_SITE_MIRROR3	:= $(MTDUTILS_SITE_MIRROR3)
 MTDUTILS_HOST_PACKAGE		:= $(MTDUTILS_PACKAGE)
-MTDUTILS_HOST_SRC_DIR		:= $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
-MTDUTILS_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/mtd-utils-$(MTDUTILS_VERSION)
+MTDUTILS_HOST_SRC_DIR		:= $(embtk_toolsb)/mtd-utils-$(MTDUTILS_VERSION)
+MTDUTILS_HOST_BUILD_DIR		:= $(embtk_toolsb)/mtd-utils-$(MTDUTILS_VERSION)
 
 MTDUTILS_HOST_DEPS	:= zlib_host_install lzo_host_install \
 			e2fsprogs_host_install
diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk
index 746ad6d..3812e33 100644
--- a/mk/pkgconfig.mk
+++ b/mk/pkgconfig.mk
@@ -26,8 +26,8 @@ PKGCONFIG_NAME		:= pkg-config
 PKGCONFIG_VERSION	:= $(call embtk_get_pkgversion,pkgconfig)
 PKGCONFIG_SITE		:= http://pkgconfig.freedesktop.org/releases
 PKGCONFIG_PACKAGE	:= pkg-config-$(PKGCONFIG_VERSION).tar.gz
-PKGCONFIG_SRC_DIR	:= $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
-PKGCONFIG_BUILD_DIR	:= $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION)
+PKGCONFIG_SRC_DIR	:= $(embtk_toolsb)/pkg-config-$(PKGCONFIG_VERSION)
+PKGCONFIG_BUILD_DIR	:= $(embtk_toolsb)/pkg-config-$(PKGCONFIG_VERSION)
 
 PKGCONFIG_BIN			:= $(HOSTTOOLS)/usr/bin/pkg-config
 
diff --git a/mk/squashfs.mk b/mk/squashfs.mk
index 45b2a6c..856fe37 100644
--- a/mk/squashfs.mk
+++ b/mk/squashfs.mk
@@ -27,7 +27,7 @@ SQUASHFS_TOOLS_NAME		:= squashfs
 SQUASHFS_TOOLS_VERSION		:= $(call embtk_get_pkgversion,squashfs_tools)
 SQUASHFS_TOOLS_SITE		:= http://sourceforge.net/projects/squashfs/files/squashfs/squashfs$(SQUASHFS_TOOLS_VERSION)
 SQUASHFS_TOOLS_PACKAGE		:= squashfs$(SQUASHFS_TOOLS_VERSION).tar.gz
-SQUASHFS_TOOLS_SRC_DIR		:= $(TOOLS_BUILD)/squashfs$(SQUASHFS_TOOLS_VERSION)
+SQUASHFS_TOOLS_SRC_DIR		:= $(embtk_toolsb)/squashfs$(SQUASHFS_TOOLS_VERSION)
 SQUASHFS_TOOLS_BUILD_DIR	:= $(SQUASHFS_TOOLS_SRC_DIR)/squashfs-tools
 
 MKSQUASHFS_BIN	:= $(HOSTTOOLS)/usr/bin/mksquashfs
diff --git a/mk/uclibc.mk b/mk/uclibc.mk
index 911c84b..4d5ff75 100755
--- a/mk/uclibc.mk
+++ b/mk/uclibc.mk
@@ -28,7 +28,7 @@ UCLIBC_VERSION		:= $(call embtk_get_pkgversion,uClibc)
 UCLIBC_SITE		:= http://www.uclibc.org/downloads
 UCLIBC_GIT_SITE		:= git://git.busybox.net/uClibc
 UCLIBC_PACKAGE		:= uClibc-$(UCLIBC_VERSION).tar.bz2
-UCLIBC_SRC_DIR		:= $(TOOLS_BUILD)/uClibc-$(UCLIBC_VERSION)
+UCLIBC_SRC_DIR		:= $(embtk_toolsb)/uClibc-$(UCLIBC_VERSION)
 UCLIBC_BUILD_DIR	:= $(call __embtk_pkg_srcdir,uClibc)
 
 UCLIBC_DOTCONFIG	:= $(UCLIBC_BUILD_DIR)/.config
diff --git a/mk/zlib_host.mk b/mk/zlib_host.mk
index a243f18..dbad8f5 100644
--- a/mk/zlib_host.mk
+++ b/mk/zlib_host.mk
@@ -27,8 +27,8 @@ ZLIB_HOST_NAME		:= zlib
 ZLIB_HOST_VERSION	:= $(call embtk_get_pkgversion,zlib_host)
 ZLIB_HOST_SITE		:= http://zlib.net
 ZLIB_HOST_PACKAGE	:= zlib-$(ZLIB_HOST_VERSION).tar.bz2
-ZLIB_HOST_SRC_DIR	:= $(TOOLS_BUILD)/zlib-$(ZLIB_HOST_VERSION)
-ZLIB_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/zlib-$(ZLIB_HOST_VERSION)
+ZLIB_HOST_SRC_DIR	:= $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION)
+ZLIB_HOST_BUILD_DIR	:= $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION)
 
 ZLIB_HOST_CONFIGURE_ENV		:= CC=$(HOSTCC_CACHED)