Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
--- lfs/grep | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/lfs/grep b/lfs/grep index d22b359..9f3a38e 100644 --- a/lfs/grep +++ b/lfs/grep @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 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,7 +24,7 @@
include Config
-VER = 2.22 +VER = 2.23
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 = e1015e951a49a82b02e38891026ef5df +$(DL_FILE)_MD5 = f46aa9d0d2577b9212a104348a286787
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)
-
Marcel Lorenz