Cleanup toolchain scripts

No functional changes, just some tidy up

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/automake b/lfs/automake
index 0b3d9cce89574512855e5a9c033bd163d69a275d..d18439443dde199a9baf90ce4cd8d11a63ba5aaf 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -35,10 +35,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
-       PREFIX = /usr
        TARGET = $(DIR_INFO)/$(THISAPP)
 else
-       PREFIX = $(TOOLS_DIR)
        TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif
 
@@ -81,10 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
-       cd $(DIR_APP) && ./configure \
-               --prefix=$(PREFIX) \
-               --docdir=/usr/share/doc/automake-1.15
-
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/bash b/lfs/bash
index 99a293dbb6b9753ccb6e3f6c1ad5ab0a21a76bd9..bb2a38b34aeaaabce73d1d38a2b398d1b1c8f0a2 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -35,11 +35,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  CONFIGURE_OPTIONS = --prefix=/usr --bindir=/bin \
-    --with-installed-readline
+  CONFIGURE_OPTIONS = \
+       --bindir=/bin \
+       --with-installed-readline
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
 endif
 
 CONFIGURE_OPTIONS += \
@@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch
 
-       cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) $(CONFIGURE_OPTIONS)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 

diff --git a/lfs/bison b/lfs/bison
index 9e539f0a4cb6cbddbb8a7995f3f437c152c99551..65746f59e312db975f19819c176c02b1ab5b774e 100644 (file)
--- a/lfs/bison
+++ b/lfs/bison
@@ -33,10 +33,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 ifeq "$(TOOLCHAIN)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
 endif
 
 ###############################################################################
@@ -77,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/coreutils b/lfs/coreutils
index 904bd2bdf16ec65851805cc3c682ed70cdd3fcc9..26482aa0f5c81524ad7085544ac76c59eb505e8b 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -35,13 +35,12 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  CONFIGURE_OPTIONS = --prefix=/usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
 endif
 
 CONFIGURE_OPTIONS += \
+       --prefix=$(PREFIX) \
        --enable-largefile \
        --disable-rpath \
        --enable-install-program=arch \

diff --git a/lfs/diffutils b/lfs/diffutils
index 02586d8360dfa66c6ffa3d0c93017d98437ce085..d37dff7b2681d425bc34472573c9eb9689780862 100644 (file)
--- a/lfs/diffutils
+++ b/lfs/diffutils
@@ -35,14 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -83,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(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 --prefix=$(PREFIX) --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/findutils b/lfs/findutils
index 6b9e0fc74d285728260e725861837aca97d6f9b4..ebffc2e5834d3f2400298c24c393bbcd7ba1d733 100644 (file)
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -37,13 +37,9 @@ ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib/findutils \
     --localstatedir=/var/lib/locate --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -85,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(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) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
        mv -v /usr/bin/find /bin
        sed -i -e 's|BINDIR=/usr/bin|BINDIR=/bin|' /usr/bin/updatedb

diff --git a/lfs/flex b/lfs/flex
index 8c8c26f950333e806a2d2df62d5e2f499b9f0993..4037e93e452ae0c67ef8fe9bbebab6c51220bbb8 100644 (file)
--- a/lfs/flex
+++ b/lfs/flex
@@ -35,15 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 
@@ -87,9 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
        cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
-               ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+               ./configure --prefix=$(PREFIX) --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
        ln -sfv libfl.a /usr/lib/libl.a
        echo "#!/bin/sh"                        >  /usr/bin/lex

diff --git a/lfs/gettext b/lfs/gettext
index e4eeb7299ac952e36ff023f2baf466bac284fb64..b1bc9630624368cf78519b52509eb21652d385af 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -36,13 +36,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-shared --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -85,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 ifeq "$(ROOT)" ""
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(EXTRA_MAKE)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
 else
        cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP)/gettext-tools && make -C gnulib-lib

diff --git a/lfs/grep b/lfs/grep
index 3c3d9769636f1ad89c6bdcaded9acfc08dc4cfb9..703e2f7c5de55e3dd6923b2838f686e7935d6429 100644 (file)
--- a/lfs/grep
+++ b/lfs/grep
@@ -40,7 +40,6 @@ else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls \
     --disable-perl-regexp --without-included-regex
-
 endif
 
 ###############################################################################

diff --git a/lfs/m4 b/lfs/m4
index 5bb8604442527f52b045183cc6ccfd6390658aa7..7d624d98513e86dee72c35f286af2bca9a9492c5 100644 (file)
--- a/lfs/m4
+++ b/lfs/m4
@@ -35,12 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
-  EXTRA_MAKE =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
-  EXTRA_MAKE =
 endif
 
 ###############################################################################
@@ -81,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/make b/lfs/make
index 8d7d37bc5efbb65bef07f8f00417e55c296072cb..bee734ba4de736c568a6bba3587143548ba046ab 100644 (file)
--- a/lfs/make
+++ b/lfs/make
@@ -39,14 +39,8 @@ DEPS       = ""
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ifeq "$(PASS)" "1"
@@ -96,8 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-build-fix.patch
        cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-SEGV.patch
-       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ncurses b/lfs/ncurses
index 1186b5244f3aeea2a12cc1c7f8deb37269238347..09efd733e9da167f5a12fdbe2a47836ac95ad25e 100644 (file)
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -35,10 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  PREFIX = /usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = $(TOOLS_DIR)
   EXTRA_CONFIG = --build=$(BUILDTARGET)
 endif
 

diff --git a/lfs/patch b/lfs/patch
index 065314d51b5a8e0a9fbb038ec22678affa9ecbd7..10b03d43b21fbd8c85dc16118b025e8480d827d5 100644 (file)
--- a/lfs/patch
+++ b/lfs/patch
@@ -35,14 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 endif
 
 ###############################################################################
@@ -83,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(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 --prefix=$(PREFIX)
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/pkg-config b/lfs/pkg-config
index fe2752a0dca625af01e3c51083379a49dc90ff1a..3d039ddf28478b630b6033e57bfd1b6fb5af11d3 100644 (file)
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -36,10 +36,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  PREFIX = /usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = $(TOOLS_DIR)
 endif
 
 ###############################################################################
@@ -80,12 +78,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
-else
-       mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
-endif
        cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+
+ifeq "$(TOOLCHAIN)" "1"
+       mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
+endif
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/tar b/lfs/tar
index 2cca09935ce35dc7c758ad20b1422a917a5e973b..6a949a003fbd274b7dc826172988745808e294ad 100644 (file)
--- a/lfs/tar
+++ b/lfs/tar
@@ -37,13 +37,9 @@ ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --bindir=/bin \
        --libexecdir=/usr/sbin --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -85,7 +81,7 @@ $(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) FORCE_UNSAFE_CONFIGURE=1
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/tcl b/lfs/tcl
index fb464dca350ae5791e110611557163acd33af3d5..73c92cc812b4d2b332abfa59fcff054a9702d2bd 100644 (file)
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -75,11 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifneq "$(ROOT)" ""
-       cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR)
-else
-       cd $(DIR_APP)/unix && ./configure --prefix=/usr
-endif
+       cd $(DIR_APP)/unix && ./configure --prefix=$(PREFIX)
        cd $(DIR_APP)/unix && make $(MAKETUNING)
        cd $(DIR_APP)/unix && make install
 ifneq "$(ROOT)" ""

diff --git a/lfs/texinfo b/lfs/texinfo
index 8927156449752be561b8a6f54ee222d40e8e8540..535612c44a9432c6efeca7e6271b47fe9e546421 100644 (file)
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -35,10 +35,8 @@ DIR_APP    = $(DIR_SRC)/texinfo-6.3
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif
 
 ###############################################################################
@@ -79,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) --disable-nls
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/xz b/lfs/xz
index 219c160b9a3982a6da766575816b3393fe180676..f8940ab4ed43ebaf0259f1d08080b1e9509e7656 100644 (file)
--- a/lfs/xz
+++ b/lfs/xz
@@ -32,10 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 ifeq "$(ROOT)" ""
-       PREFIX = /usr
        TARGET = $(DIR_INFO)/$(THISAPP)
 else
-       PREFIX = $(TOOLS_DIR)
        TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif