X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Ftar;h=6a949a003fbd274b7dc826172988745808e294ad;hb=39eb05b2008e43ef666227f53409e038c0074809;hp=5919b04746a8299e4315ff11cd7086bcc05adace;hpb=1a01c170110374afcc6b7cfe26e63623e4f3aabb;p=ipfire-2.x.git

diff --git a/lfs/tar b/lfs/tar
index 5919b04746..6a949a003f 100644
--- a/lfs/tar
+++ b/lfs/tar
@@ -31,19 +31,15 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --bindir=/bin \
-	--libexecdir=/usr/sbin --disable-nls FORCE_UNSAFE_CONFIGURE=1
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
+	--libexecdir=/usr/sbin --disable-nls
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
 endif
 
 ###############################################################################
@@ -84,8 +80,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 $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) FORCE_UNSAFE_CONFIGURE=1
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)