X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ffindutils;h=a6f6647c0d433107a0188298bc7e2942ab2d6fe4;hp=f856cc30f3e3188ae45ddf0a529a77a04eced9b7;hb=dd714b8aad61bcff68a67ff3570018d946f09067;hpb=f522e3076bd5ed0b858ac687238a272512801ded

diff --git a/lfs/findutils b/lfs/findutils
index f856cc30f3..a6f6647c0d 100644
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: findutils,v 1.3.2.3 2005/02/26 12:26:43 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,18 +26,19 @@
 
 include Config
 
-VER        = 4.1.20
+VER        = 4.2.27
 
 THISAPP    = findutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_GNU)/findutils
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/bin --disable-nls
+  EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib/findutils \
+    --localstatedir=/var/lib/locate --disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
@@ -61,7 +56,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e90ce7222daadeb8616b8db461e17cbc
+$(DL_FILE)_MD5 = f1e0ddf09f28f8102ff3b90f3b5bc920
 
 install : $(TARGET)
 
@@ -92,7 +87,11 @@ $(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 $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ifeq "$(ROOT)" ""
+	mv -v /usr/bin/find /bin
+	sed -i -e 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)