[tools] m4: update to 1.4.17

[openwrt.git] / tools / lzma / Makefile

diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index 5e500ad..6e01051 100644 (file)
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -18,16 +18,16 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/host-build.mk
 
 UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
+ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone
 
 define Host/Compile
-       $(MAKE) -C $(UTIL_DIR) -f makefile.gcc
+       $(MAKE) -C $(UTIL_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)"
+       $(MAKE) -C $(ALONE_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)"
 endef
 
 define Host/Install
-       $(INSTALL_DIR) $(STAGING_DIR_HOST)/lib $(STAGING_DIR_HOST)/include $(STAGING_DIR_HOST)/bin
-       $(CP) $(HOST_BUILD_DIR)/C/*.h $(STAGING_DIR_HOST)/include/
-       $(CP) $(UTIL_DIR)/liblzma.a $(STAGING_DIR_HOST)/lib/
-       $(CP) $(HOST_BUILD_DIR)/C/LzmaUtil/lzma $(STAGING_DIR_HOST)/bin/lzma-new
+       $(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