X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fautomake;h=0dcb58983619ffd580e9f10fc2ab8ad22cc09a93;hb=1dd31d858ecc4d37fa9c895b59e2b752cc124818;hp=9b19a1b1722c0e034f5b9243bf000a5230462aa9;hpb=360378014d0ba62c1ced4b204080f05c2a3de575;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/automake b/lfs/automake
index 9b19a1b172..0dcb589836 100644
--- a/lfs/automake
+++ b/lfs/automake
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        = 1.12.4
+VER        = 1.16.2
 
 THISAPP    = automake-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,6 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# Normal build or $(TOOLS_DIR) build.
+#
+ifeq "$(ROOT)" ""
+	TARGET = $(DIR_INFO)/$(THISAPP)
+else
+	TARGET = $(DIR_INFO)/$(THISAPP)-tools
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7395a0420ecb5c9bc43e5fcf4824df36
+$(DL_FILE)_MD5 = 6cb234c86f3f984df29ce758e6d0d1d7
 
 install : $(TARGET)
 
@@ -70,7 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)