summaryrefslogtreecommitdiff
path: root/package/lzma
diff options
context:
space:
mode:
authorMichael Roth <mroth@nessie.de>2009-09-23 01:30:00 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-09-23 09:15:27 +0200
commitcb5710c538fce01f4875a64e6de4b37a7718005b (patch)
treec1ebe4a0dbbbe4c5a24f7cc765854b90e3a585df /package/lzma
parentbe695dcc3c9afd6836b90151301b6322de5dfcd8 (diff)
rename TOOL_BUILD_DIR to TOOLCHAIN_DIR
To reflect the new output directory hierachy rename the Makefile variable TOOL_BUILD_DIR to TOOLCHAIN_DIR. Signed-off-by: Michael Roth <mroth@nessie.de> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/lzma')
-rw-r--r--package/lzma/lzma.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 89faf285b..e383e7bcd 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -7,12 +7,12 @@ LZMA_VERSION:=4.32.6
LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz
LZMA_CAT:=$(ZCAT)
LZMA_SITE:=http://tukaani.org/lzma/
-LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VERSION)
+LZMA_HOST_DIR:=$(TOOLCHAIN_DIR)/lzma-$(LZMA_VERSION)
LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VERSION)
LZMA_TARGET_BINARY:=bin/lzma
# lzma binary for use on the host
-LZMA=$(TOOL_BUILD_DIR)/bin/lzma
+LZMA=$(TOOLCHAIN_DIR)/bin/lzma
HOST_LZMA_BINARY=$(shell package/lzma/lzmacheck.sh)
HOST_LZMA_IF_ANY=$(shell toolchain/dependencies/check-host-lzma.sh)
@@ -27,7 +27,7 @@ $(DL_DIR)/$(LZMA_SOURCE):
######################################################################
$(LZMA_HOST_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
- $(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ $(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LZMA_HOST_DIR) package/lzma/ lzma\*.patch
touch $@
@@ -51,15 +51,15 @@ $(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma
.PHONY: lzma-host use-lzma-host-binary
use-lzma-host-binary:
- if [ ! -f "$(TOOL_BUILD_DIR)/bin/lzma" ]; then \
- [ -d $(TOOL_BUILD_DIR)/bin ] || mkdir -p $(TOOL_BUILD_DIR)/bin; \
- ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOL_BUILD_DIR)/bin/lzma"; \
+ if [ ! -f "$(TOOLCHAIN_DIR)/bin/lzma" ]; then \
+ [ -d $(TOOLCHAIN_DIR)/bin ] || mkdir -p $(TOOLCHAIN_DIR)/bin; \
+ ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOLCHAIN_DIR)/bin/lzma"; \
fi
build-lzma-host-binary: $(LZMA_HOST_DIR)/src/lzma/lzma
- -rm -f $(TOOL_BUILD_DIR)/bin/lzma
- [ -d $(TOOL_BUILD_DIR)/bin ] || mkdir $(TOOL_BUILD_DIR)/bin
- cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOL_BUILD_DIR)/bin/lzma
+ -rm -f $(TOOLCHAIN_DIR)/bin/lzma
+ [ -d $(TOOLCHAIN_DIR)/bin ] || mkdir $(TOOLCHAIN_DIR)/bin
+ cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOLCHAIN_DIR)/bin/lzma
host-lzma: $(HOST_LZMA_BINARY)