Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- lfs/zstd | 11 +++++++++-- make.sh | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lfs/zstd b/lfs/zstd index c6af0f129..a4f0e1699 100644 --- a/lfs/zstd +++ b/lfs/zstd @@ -30,7 +30,14 @@ THISAPP = zstd-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) + +ifeq "$(TOOLCHAIN)" "1" + TARGET = $(DIR_INFO)/$(THISAPP)-tools + PREFIX = $(TOOLS_DIR) +else + TARGET = $(DIR_INFO)/$(THISAPP) + PREFIX = /usr +endif
############################################################################### # Top-level Rules @@ -74,6 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make prefix=/usr install + cd $(DIR_APP) && make prefix=$(PREFIX) install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index cf4e779e4..a6c088dd5 100755 --- a/make.sh +++ b/make.sh @@ -1037,6 +1037,7 @@ buildtoolchain() { lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 lfsmake1 zlib + lfsmake1 zstd lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect