Fix board_type allocation (again)

[openwrt.git] / tools / lzma / Makefile

diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index 47f21d1..fb5929c 100644 (file)
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -13,32 +13,28 @@ PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/sevenzip
 PKG_MD5SUM:=155c1ebce5bc6710ae7ecc926226d9d7
 
 PKG_SOURCE_URL:=@SF/sevenzip
 PKG_MD5SUM:=155c1ebce5bc6710ae7ecc926226d9d7
 

-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lzma
+PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/lzma
+PKG_UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/ $(TAR_OPTIONS)

 
 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
 
 
 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
 

-define Build/Prepare
-       bzcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/ $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-endef
-

 define Build/Compile
        $(MAKE) -C $(LIB_DIR)
        $(MAKE) -f makefile.gcc -C $(ALONE_DIR)
 endef
 
 define Build/Install
 define Build/Compile
        $(MAKE) -C $(LIB_DIR)
        $(MAKE) -f makefile.gcc -C $(ALONE_DIR)
 endef
 
 define Build/Install

-       mkdir -p $(STAGING_DIR)/host/lib
-       $(CP) $(LIB_DIR)/liblzma.a $(STAGING_DIR)/host/lib/
-       mkdir -p $(STAGING_DIR)/bin
-       $(CP) $(ALONE_DIR)/lzma $(STAGING_DIR)/bin/
+       $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
+       $(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/

 endef
 
 define Build/Clean
 endef
 
 define Build/Clean

-       rm -f $(STAGING_DIR)/host/lib/liblzma.a $(STAGING_DIR)/bin/lzma
+       rm -f \
+               $(STAGING_DIR_HOST)/lib/liblzma.a \
+               $(STAGING_DIR_HOST)/bin/lzma

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))