dnsdist: Improve initscript to prevent reload on config error

[people/pmueller/ipfire-2.x.git] / lfs / gawk

diff --git a/lfs/gawk b/lfs/gawk
index 62bad0164e84facad0201458f1629159a9c17731..2e32f3bea5160ea81ac8d448a98f6bfc5c8fe233 100644 (file)
--- a/lfs/gawk
+++ b/lfs/gawk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015   IPFire Team  <info@ipfire.org>                    #
+# Copyright (C) 2007-2018  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        #
@@ -25,20 +25,20 @@
 
 include Config
 
-VER        = 4.1.4
+VER        = 5.1.0
 
 THISAPP    = gawk-$(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 --libexecdir=/usr/lib --disable-nls
 else
        TARGET = $(DIR_INFO)/$(THISAPP)-tools
-       EXTRA_CONFIG = --prefix=/tools --disable-nls
+       EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
 endif
 
 ###############################################################################
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4e7dbc81163e60fd4f0b52496e7542c9
+$(DL_FILE)_MD5 = 8470c34eeecc41c1aa0c5d89e630df50
 
 install : $(TARGET)
 
@@ -79,6 +79,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install