lzma:

 * combine two lzma versions to one single makefile (makes it easier to switch between both)
 * refs #2690


git-svn-id: file:///var/svn/freetz/trunk@13029 149334a1-2f27-0410-a3b9-fc62619ac1e6

tools/make/lzma/lzma.mk

@@ -1,12 +1,17 @@
 LZMA_VERSION:=443
 LZMA_SOURCE:=lzma$(LZMA_VERSION).tar.bz2
-LZMA_SOURCE_MD5:=c4e1b467184c7cffd4371c74df2baf0f
+LZMA_SOURCE_MD5_443:=c4e1b467184c7cffd4371c74df2baf0f
+LZMA_SOURCE_MD5_465:=29d5ffd03a5a3e51aef6a74e9eafb759
+LZMA_SOURCE_MD5:=$(LZMA_SOURCE_MD5_$(LZMA_VERSION))
 LZMA_SITE:=@SF/sevenzip
 
 LZMA_DIR:=$(TOOLS_SOURCE_DIR)/lzma$(LZMA_VERSION)
 LZMA_MAKE_DIR:=$(TOOLS_DIR)/make/lzma
-LZMA_ALONE_DIR:=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
-LZMA_LIB_DIR:=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib
+
+LZMA_IMPL_SUBDIR_443:=C
+LZMA_IMPL_SUBDIR_465:=CPP
+LZMA_ALONE_DIR:=$(LZMA_DIR)/$(LZMA_IMPL_SUBDIR_$(LZMA_VERSION))/7zip/Compress/LZMA_Alone
+LZMA_LIB_DIR:=$(LZMA_DIR)/$(LZMA_IMPL_SUBDIR_$(LZMA_VERSION))/7zip/Compress/LZMA_Lib
 
 lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
 $(DL_DIR)/$(LZMA_SOURCE): | $(DL_DIR)
@@ -16,7 +21,7 @@ lzma-unpacked: $(LZMA_DIR)/.unpacked
 $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) | $(TOOLS_SOURCE_DIR) $(UNPACK_TARBALL_PREREQUISITES)
 	mkdir -p $(LZMA_DIR)
 	$(call UNPACK_TARBALL,$(DL_DIR)/$(LZMA_SOURCE),$(LZMA_DIR))
-	$(call APPLY_PATCHES,$(LZMA_MAKE_DIR)/patches,$(LZMA_DIR))
+	$(call APPLY_PATCHES,$(LZMA_MAKE_DIR)/patches/$(LZMA_VERSION),$(LZMA_DIR))
 	touch $@
 
 $(LZMA_ALONE_DIR)/lzma: $(LZMA_DIR)/.unpacked