From 31e94846beef604223b0409352bcc53e33470018 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 20 Aug 2012 12:13:40 +0200
Subject: [PATCH] xz: Build xz in toolchain.

---
 lfs/xz  | 11 ++++++++---
 make.sh |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lfs/xz b/lfs/xz
index 4845227c8..cff9bb3de 100644
--- a/lfs/xz
+++ b/lfs/xz
@@ -31,7 +31,13 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-TARGET = $(DIR_INFO)/$(THISAPP)
+ifeq "$(ROOT)" ""
+	PREFIX = /usr
+	TARGET = $(DIR_INFO)/$(THISAPP)
+else
+	PREFIX = /tools
+	TARGET = $(DIR_INFO)/$(THISAPP)-tools
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -43,7 +49,6 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 $(DL_FILE)_MD5 = cc4044fcc073b8bcf3164d1d0df82161
 
-
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -72,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index 09d416718..80f63a92f 100755
--- a/make.sh
+++ b/make.sh
@@ -284,6 +284,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 xz
     lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain		PASS=2
     export PATH=$ORG_PATH
@@ -350,6 +351,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
+    lfsmake2 xz
     lfsmake2 grub
 }
 
@@ -366,7 +368,6 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
-- 
2.39.2