X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=tools%2Flzma%2FMakefile;h=b39c8627ecc14b8f2213e24b9e5152572d874aa6;hp=79d8d0c9bd2e7c267101f29a88b9ef997bcdee92;hb=391eb6e69c09d9f107b8c30a91c63dce37820043;hpb=4454a35bc042239402d1eabaa0904a4c134e38eb

diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index 79d8d0c9b..b39c8627e 100644
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -7,34 +7,32 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lzma
-PKG_VERSION:=432
+PKG_VERSION:=4.65
 
-PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://kent.dl.sourceforge.net/sourceforge/sevenzip/
-PKG_MD5SUM:=155c1ebce5bc6710ae7ecc926226d9d7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_MD5SUM:=434e51a018b4c8ef377bf81520a53af0
 
-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)
+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
+UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
+ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone
 
-define Build/Compile
-	$(MAKE) -C $(LIB_DIR)
-	$(MAKE) -f makefile.gcc -C $(ALONE_DIR)
+define Host/Compile
+	$(MAKE) -C $(UTIL_DIR) -f makefile.gcc
+	$(MAKE) -C $(ALONE_DIR) -f makefile.gcc
 endef
 
-define Build/Install
-	$(INSTALL_DATA) $(LIB_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
-	$(INSTALL_BIN) $(ALONE_DIR)/lzma $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/lib $(STAGING_DIR_HOST)/include $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone/lzma_alone $(STAGING_DIR_HOST)/bin/lzma
+	$(CP) $(HOST_BUILD_DIR)/C/*.h $(STAGING_DIR_HOST)/include/
+	$(CP) $(UTIL_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
 endef
 
-define Build/Clean
-	rm -f \
-		$(STAGING_DIR_HOST)/lib/liblzma.a \
-		$(STAGING_DIR_HOST)/bin/lzma
+define Host/Clean
 endef
 
 $(eval $(call HostBuild))