squashfs4: Add support for LZMA Magic to unsquashfs

[openwrt.git] / tools / lzma / Makefile

diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index b982415..4922f80 100644 (file)
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -7,33 +7,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lzma
-PKG_VERSION:=4.32
+PKG_VERSION:=4.65
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
-PKG_MD5SUM:=5587d6ac230ad1903d504fc3253f0e42
+PKG_MD5SUM:=434e51a018b4c8ef377bf81520a53af0
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-LIB_DIR=$(HOST_BUILD_DIR)/C/7zip/Compress/LZMA_Lib
-ALONE_DIR=$(HOST_BUILD_DIR)/C/7zip/Compress/LZMA_Alone
+UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
+ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone
 
 define Host/Compile
-       $(MAKE) -C $(LIB_DIR)
-       $(MAKE) -f makefile.gcc -C $(ALONE_DIR)
+       $(MAKE) -C $(UTIL_DIR) -f makefile.gcc
+       $(MAKE) -C $(ALONE_DIR) -f makefile.gcc
 endef
 
 define Host/Install
-       $(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
-       $(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/
+       $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma
 endef
 
 define Host/Clean
-       rm -f \
-               $(STAGING_DIR_HOST)/lib/liblzma.a \
-               $(STAGING_DIR_HOST)/bin/lzma
 endef
 
 $(eval $(call HostBuild))