X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgrep;h=3c3d9769636f1ad89c6bdcaded9acfc08dc4cfb9;hb=5b117ef49aaad5f39a81938783b2cfe05fc5d91c;hp=0514ccb384717b2972f3ae9d5b3c66d6407ff7f7;hpb=3b7913e671665fc39d8c60eff292d016299a117c;p=ipfire-2.x.git

diff --git a/lfs/grep b/lfs/grep
index 0514ccb384..3c3d976963 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  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,26 +24,23 @@
 
 include Config
 
-VER        = 2.13
+VER        = 2.27
 
 THISAPP    = grep-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 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 --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls \
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls \
     --disable-perl-regexp --without-included-regex
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+
 endif
 
 ###############################################################################
@@ -54,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5894d484e6c02249f9702d0d8a472115
+$(DL_FILE)_MD5 = 6138dd227c39d4a25f81eea76a44d4cb
 
 install : $(TARGET)
 
@@ -85,7 +82,7 @@ $(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) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)