X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgrep;h=32a674870c5a2a4adc5ac54864d19a87721c7091;hb=3d5c499e0ca73c9a787815b8894d6cfcb0416a1b;hp=e9b0b18d4db801dc629b81ccd7caf1751023bb79;hpb=31901da1edb401590960558b61e31ddd9fda89c1;p=ipfire-2.x.git diff --git a/lfs/grep b/lfs/grep index e9b0b18d4d..32a674870c 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 # # # # 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,7 +24,7 @@ include Config -VER = 2.14 +VER = 2.24 THISAPP = grep-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -36,14 +36,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) 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 \ --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 = d4a3f03849d1e17ce56ab76aa5a24cab +$(DL_FILE)_MD5 = f1c980134c04692a90078e87283074b6 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)