Cleanup toolchain scripts

[ipfire-2.x.git] / lfs / findutils

diff --git a/lfs/findutils b/lfs/findutils
index d1a520b3f6837b01dcded126413d21ad7dcfe3fa..ebffc2e5834d3f2400298c24c393bbcd7ba1d733 100644 (file)
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -31,19 +31,15 @@ DL_FILE    = $(THISAPP).tar.gz
 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 --libexecdir=/usr/lib/findutils \
     --localstatedir=/var/lib/locate --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
 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