build system refactoring in preparation for allowing packages to do host-build steps

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14610 3c298f89-4303-0410-b956-a3cf2f4a3e73

21 files changed, 152 insertions, 152 deletions

diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile
index 30ca2d28d..12bbaba25 100644
--- a/tools/autoconf/Makefile
+++ b/tools/autoconf/Makefile
@@ -15,23 +15,23 @@ PKG_MD5SUM:=e1fb8fe0b22e651240afdfa2be537a3c
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	$(call Build/Configure/Default,\
+define Host/Configure
+	$(call Host/Configure/Default,\
 		--datarootdir=$(STAGING_DIR_HOST)/share \
 	)
 endef
 
-define Build/Compile
-	export SHELL="$(BASH)"; $(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
-define Build/Install
-	export SHELL="$(BASH)"; $(MAKE) -C $(PKG_BUILD_DIR) install
+define Host/Install
+	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) install
 endef
 
-define Build/Clean
-	export SHELL="$(BASH)"; $(MAKE) -C $(PKG_BUILD_DIR) uninstall
-	$(call Build/Clean/Default)
+define Host/Clean
+	export SHELL="$(BASH)"; $(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(call Host/Clean/Default)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 2b8a6f345..679a95421 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -15,27 +15,27 @@ PKG_MD5SUM:=c11b8100bb311492d8220378fd8bf9e0
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	$(call Build/Configure/Default,\
+define Host/Configure
+	$(call Host/Configure/Default,\
 		--datarootdir=$(STAGING_DIR_HOST)/share \
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) install
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
 	mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
 	$(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
 	ln -f $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
 endef
 
-define Build/Clean
-	$(MAKE) -C $(PKG_BUILD_DIR) uninstall
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(call Build/Clean/Default)
+define Host/Clean
+	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(MAKE) -C $(HOST_BUILD_DIR) clean
+	$(call Host/Clean/Default)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index 2b8561205..58a5603ef 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -16,18 +16,18 @@ PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) install
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
 endef
 
-define Build/Clean
-	$(MAKE) -C $(PKG_BUILD_DIR) uninstall
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(call Build/Clean/Default)
+define Host/Clean
+	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(MAKE) -C $(HOST_BUILD_DIR) clean
+	$(call Host/Clean/Default)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index 50714ad7d..db138c019 100644
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -18,27 +18,27 @@ PKG_CAT:=zcat
 include $(INCLUDE_DIR)/host-build.mk
 
 ifneq ($(strip $(shell which ccache >/dev/null && echo found)),found)
-  define Build/Compile
-	$(MAKE) CC="$(HOSTCC)" -C $(PKG_BUILD_DIR)
+  define Host/Compile
+	$(MAKE) CC="$(HOSTCC)" -C $(HOST_BUILD_DIR)
   endef
 
-  define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) install
+  define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) install
   endef
 
-  define Build/Clean
-	-$(MAKE) -C $(PKG_BUILD_DIR) uninstall
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(call Build/Clean/Default)
+  define Host/Clean
+	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	-$(MAKE) -C $(HOST_BUILD_DIR) clean
+	$(call Host/Clean/Default)
   endef
 else
-  define Build/Prepare
+  define Host/Prepare
   endef
-  define Build/Configure
+  define Host/Configure
   endef
-  define Build/Compile
+  define Host/Compile
   endef
-  define Build/Clean
+  define Host/Clean
   endef
 endif
 
diff --git a/tools/dtc/Makefile b/tools/dtc/Makefile
index b41484aae..c686b204d 100644
--- a/tools/dtc/Makefile
+++ b/tools/dtc/Makefile
@@ -14,19 +14,19 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.jdl.com/software
 PKG_MD5SUM:=6c84b01f500bc989b0b1ad6138fb93d5
 PKG_CAT:=zcat
-PKG_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
+HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
-define Build/Install
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dtc $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/dtc $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/dtc
 endef
 
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index e2b6cf4d9..5261a2bb6 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -11,15 +11,15 @@ PKG_NAME := firmware-utils
 include $(INCLUDE_DIR)/host-build.mk
 
 define cc
-	$(CC) $(HOST_CFLAGS) -include endian.h -o $(PKG_BUILD_DIR)/bin/$(1) src/$(1).c $(2)
+	$(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(1) src/$(1).c $(2)
 endef
 
 define cc2
-	$(CC) $(HOST_CFLAGS) -include endian.h -o $(PKG_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
+	$(CC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
 endef
 
-define Build/Compile
-	mkdir -p $(PKG_BUILD_DIR)/bin
+define Host/Compile
+	mkdir -p $(HOST_BUILD_DIR)/bin
 	$(call cc,addpattern)
 	$(call cc,trx)
 	$(call cc,motorola-bin)
@@ -41,8 +41,8 @@ define Build/Compile
 	$(call cc2,mkplanexfw sha1)
 endef
 
-define Build/Install
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/* $(STAGING_DIR_HOST)/bin/
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/genext2fs/Makefile b/tools/genext2fs/Makefile
index 5878b5c04..279c40bb5 100644
--- a/tools/genext2fs/Makefile
+++ b/tools/genext2fs/Makefile
@@ -17,8 +17,8 @@ PKG_MD5SUM:=b7b6361bcce2cedff1ae437fadafe53b
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); \
+define Host/Configure
+	( cd $(HOST_BUILD_DIR); \
 		./configure \
 			--target=$(GNU_HOST_NAME) \
 			--host=$(GNU_HOST_NAME) \
@@ -38,17 +38,17 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) \
 		CFLAGS="$(HOST_CFLAGS) -include getline.h" \
 		all
 endef
 
-define Build/Install
-	install -m0755 $(PKG_BUILD_DIR)/genext2fs $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	install -m0755 $(HOST_BUILD_DIR)/genext2fs $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/genext2fs
 endef
 
diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile
index 42646716b..4c6fac425 100644
--- a/tools/gmp/Makefile
+++ b/tools/gmp/Makefile
@@ -15,8 +15,8 @@ PKG_MD5SUM:=
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
 	./configure \
 	  --prefix=$(STAGING_DIR_HOST) \
 	  --build=$(GNU_HOST_NAME) \
@@ -27,16 +27,16 @@ define Build/Configure
 	);
 endef
 
-define Build/Compile
-	make -C $(PKG_BUILD_DIR) all
+define Host/Compile
+	make -C $(HOST_BUILD_DIR) all
 endef
 
-define Build/Install
-	make -C $(PKG_BUILD_DIR) install
+define Host/Install
+	make -C $(HOST_BUILD_DIR) install
 endef
 
-define Build/Clean
-	rm -rf $(PKG_BUILD_DIR)
+define Host/Clean
+	rm -rf $(HOST_BUILD_DIR)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/ipkg-utils/Makefile b/tools/ipkg-utils/Makefile
index 830d38a7c..48eb7e379 100644
--- a/tools/ipkg-utils/Makefile
+++ b/tools/ipkg-utils/Makefile
@@ -16,16 +16,16 @@ PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Install
+define Host/Install
 	$(INSTALL_BIN) \
-		$(PKG_BUILD_DIR)/ipkg-build \
-		$(PKG_BUILD_DIR)/ipkg-buildpackage \
-		$(PKG_BUILD_DIR)/ipkg-make-index \
-		$(PKG_BUILD_DIR)/ipkg.py \
+		$(HOST_BUILD_DIR)/ipkg-build \
+		$(HOST_BUILD_DIR)/ipkg-buildpackage \
+		$(HOST_BUILD_DIR)/ipkg-make-index \
+		$(HOST_BUILD_DIR)/ipkg.py \
 		$(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR)/etc/ipkg.conf
 	rm -f $(STAGING_DIR_HOST)/bin/ipkg*
 endef
diff --git a/tools/lua/Makefile b/tools/lua/Makefile
index 1bebe09f9..13d06b107 100644
--- a/tools/lua/Makefile
+++ b/tools/lua/Makefile
@@ -20,23 +20,23 @@ PKG_MD5SUM:=d0870f2de55d59c1c8419f36e8fac150
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
+define Host/Configure
 endef
 
 TARGET_CFLAGS += -DLUA_USE_LINUX
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src luac-host
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/src luac-host
 endef
 
-define Build/Install
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/luac-host $(STAGING_DIR_HOST)/bin/luac
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/luac-host $(STAGING_DIR_HOST)/bin/luac
 endef
 
-define Build/Clean
-	$(MAKE) -C $(PKG_BUILD_DIR)/src clean
-	rm -f $(PKG_BUILD_DIR)/src/luac-host
-	$(call Build/Clean/Default)
+define Host/Clean
+	$(MAKE) -C $(HOST_BUILD_DIR)/src clean
+	rm -f $(HOST_BUILD_DIR)/src/luac-host
+	$(call Host/Clean/Default)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index da7a61062..b982415c5 100644
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -13,24 +13,24 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=5587d6ac230ad1903d504fc3253f0e42
 
-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-LIB_DIR=$(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
-ALONE_DIR=$(PKG_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
+LIB_DIR=$(HOST_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
+ALONE_DIR=$(HOST_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
 
-define Build/Compile
+define Host/Compile
 	$(MAKE) -C $(LIB_DIR)
 	$(MAKE) -f makefile.gcc -C $(ALONE_DIR)
 endef
 
-define Build/Install
+define Host/Install
 	$(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
 	$(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f \
 		$(STAGING_DIR_HOST)/lib/liblzma.a \
 		$(STAGING_DIR_HOST)/bin/lzma
diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index f2bb08dd3..da13c5b81 100644
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -10,17 +10,17 @@ PKG_NAME:=mkimage
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(HOSTCC) $(HOST_CFLAGS) -O -c src/crc32.c -o $(PKG_BUILD_DIR)/crc32.o
-	$(HOSTCC) $(HOST_CFLAGS) -O -c src/mkimage.c -o $(PKG_BUILD_DIR)/mkimage.o
-	$(HOSTCC) $(HOST_CFLAGS) -O -o $(PKG_BUILD_DIR)/mkimage $(PKG_BUILD_DIR)/mkimage.o $(PKG_BUILD_DIR)/crc32.o
+define Host/Compile
+	$(HOSTCC) $(HOST_CFLAGS) -O -c src/crc32.c -o $(HOST_BUILD_DIR)/crc32.o
+	$(HOSTCC) $(HOST_CFLAGS) -O -c src/mkimage.c -o $(HOST_BUILD_DIR)/mkimage.o
+	$(HOSTCC) $(HOST_CFLAGS) -O -o $(HOST_BUILD_DIR)/mkimage $(HOST_BUILD_DIR)/mkimage.o $(HOST_BUILD_DIR)/crc32.o
 endef
 
-define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/mkimage $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/mkimage
 endef
 
diff --git a/tools/mpfr/Makefile b/tools/mpfr/Makefile
index 58a15eb27..5abb2a2c7 100644
--- a/tools/mpfr/Makefile
+++ b/tools/mpfr/Makefile
@@ -15,8 +15,8 @@ PKG_MD5SUM:=527147c097874340cb9cee0579dacf3b
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
 	./configure \
 	  --prefix=$(STAGING_DIR_HOST) \
 	  --build=$(GNU_HOST_NAME) \
@@ -26,16 +26,16 @@ define Build/Configure
 	);
 endef
 
-define Build/Compile
-	make -C $(PKG_BUILD_DIR) all
+define Host/Compile
+	make -C $(HOST_BUILD_DIR) all
 endef
 
-define Build/Install
-	make -C $(PKG_BUILD_DIR) install
+define Host/Install
+	make -C $(HOST_BUILD_DIR) install
 endef
 
-define Build/Clean
-	rm -rf $(PKG_BUILD_DIR)
+define Host/Clean
+	rm -rf $(HOST_BUILD_DIR)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 98fb59428..448657889 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_URL=http://ftp.debian.org/debian/pool/main/m/mtd
 PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION).orig
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION).orig
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -23,15 +23,15 @@ ifneq ($(HOST_OS),Linux)
 CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h
 endif
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="$(CFLAGS)" TARGETS=mkfs.jffs2
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/util CFLAGS="$(CFLAGS)" TARGETS=mkfs.jffs2
 endef
 
-define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/mkfs.jffs2
 endef
 
diff --git a/tools/patch-cmdline/Makefile b/tools/patch-cmdline/Makefile
index cc6b9d381..9a3f971ef 100644
--- a/tools/patch-cmdline/Makefile
+++ b/tools/patch-cmdline/Makefile
@@ -10,15 +10,15 @@ PKG_NAME:=patch-cmdline
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(HOSTCC) $(HOST_CFLAGS) -include endian.h -o $(PKG_BUILD_DIR)/$(PKG_NAME) src/$(PKG_NAME).c
+define Host/Compile
+	$(HOSTCC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/$(PKG_NAME) src/$(PKG_NAME).c
 endef
 
-define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/patch-cmdline $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/patch-cmdline $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/patch-cmdline
 endef
 
diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index bcae2dfa6..0a68e742a 100644
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -15,21 +15,21 @@ PKG_MD5SUM:=fd5c547e9d66ba49bc735ccb8c791f2a
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) \
 		install
 	mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
 	$(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
 endef
 
-define Build/Clean
-	$(MAKE) -C $(PKG_BUILD_DIR) uninstall
-	$(MAKE) -C $(PKG_BUILD_DIR) clean
-	$(call Build/Clean/Default)
+define Host/Clean
+	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
+	$(MAKE) -C $(HOST_BUILD_DIR) clean
+	$(call Host/Clean/Default)
 endef
 
 $(eval $(call HostBuild))
diff --git a/tools/quilt/Makefile b/tools/quilt/Makefile
index 5294534b0..b87d776c7 100644
--- a/tools/quilt/Makefile
+++ b/tools/quilt/Makefile
@@ -15,20 +15,20 @@ PKG_MD5SUM:=d33d2442bd34387260b1c1db3e623af0
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	[ -f $(PKG_BUILD_DIR)/Makefile ]
+define Host/Configure
+	$(call Host/Configure/Default)
+	[ -f $(HOST_BUILD_DIR)/Makefile ]
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) SHELL="$(BASH)"
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)"
 endef
 
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) SHELL="$(BASH)" install
+define Host/Install
+	$(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" install
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/quilt
 endef
 
diff --git a/tools/sed/Makefile b/tools/sed/Makefile
index 0f2b3dbf2..6b3122d16 100644
--- a/tools/sed/Makefile
+++ b/tools/sed/Makefile
@@ -17,15 +17,15 @@ export SED:=
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) SHELL="$(BASH)"
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)"
 endef
 
-define Build/Install
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sed/sed $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/sed/sed $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/sed
 endef
 
diff --git a/tools/squashfs/Makefile b/tools/squashfs/Makefile
index 53baa7abf..473c52651 100644
--- a/tools/squashfs/Makefile
+++ b/tools/squashfs/Makefile
@@ -14,22 +14,22 @@ PKG_SOURCE_URL:=@SF/squashfs
 PKG_MD5SUM:=9fd05d0bfbb712f5fb95edafea5bc733
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/squashfs-tools \
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
 		LZMAPATH=$(STAGING_DIR_HOST)/lib \
 		mksquashfs-lzma unsquashfs-lzma 
 endef
 
-define Build/Install
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR_HOST)/bin/
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/squashfs-tools/unsquashfs-lzma $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
 	rm -f $(STAGING_DIR_HOST)/bin/unsquashfs-lzma
 endef
diff --git a/tools/sstrip/Makefile b/tools/sstrip/Makefile
index 8d23e36e8..d93e7618d 100644
--- a/tools/sstrip/Makefile
+++ b/tools/sstrip/Makefile
@@ -10,15 +10,15 @@ PKG_NAME:=sstrip
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(CC) $(HOST_CFLAGS) -I./include -include endian.h -o $(PKG_BUILD_DIR)/sstrip src/sstrip.c
+define Host/Compile
+	$(CC) $(HOST_CFLAGS) -I./include -include endian.h -o $(HOST_BUILD_DIR)/sstrip src/sstrip.c
 endef
 
-define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/sstrip $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(CP) $(HOST_BUILD_DIR)/sstrip $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/sstrip
 endef
 
diff --git a/tools/yaffs2/Makefile b/tools/yaffs2/Makefile
index 37da033d7..344b61a2c 100644
--- a/tools/yaffs2/Makefile
+++ b/tools/yaffs2/Makefile
@@ -15,22 +15,22 @@ PKG_SOURCE_URL:=git://android.git.kernel.org/platform/external/yaffs2.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE_VERSION:=d333fc232d7e5ae3370080d5d6f7d88ea9c6b3a1
-PKG_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
+HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/yaffs2/utils \
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/yaffs2/utils \
 		CFLAGS="$(HOST_CFLAGS) -include endian.h" \
 		mkyaffs2image
 endef
 
-define Build/Install
+define Host/Install
 	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/yaffs2/utils/mkyaffs2image $(STAGING_DIR_HOST)/bin/
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/yaffs2/utils/mkyaffs2image $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
 	rm -f $(STAGING_DIR_HOST)/bin/mkyaffs2image
 endef