X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fxz;h=fce71598b38b35de0ff747b245bcc4d2c6bfeb94;hp=4845227c8d2145ee99b4f333ef538d8a9d928b76;hb=7add463e51039d0409545f7279d43a66eba1d532;hpb=d7501a96b72a4c0d2602230cf6cb7a17fa39b8fe

diff --git a/lfs/xz b/lfs/xz
index 4845227c8..fce71598b 100644
--- a/lfs/xz
+++ b/lfs/xz
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,14 +24,20 @@
 
 include Config
 
-VER        = 4.999.9beta
+VER        = 5.0.5
 
 THISAPP    = xz-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 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
@@ -41,8 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cc4044fcc073b8bcf3164d1d0df82161
-
+$(DL_FILE)_MD5 = aa17280f4521dbeebed0fbd11cd7fa30
 
 install : $(TARGET)
 
@@ -71,8 +76,8 @@ $(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
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)