From: Erik Kapfer <erik.kapfer@ipfire.org>
Date: Tue, 7 Jul 2015 21:42:07 +0000 (+0200)
Subject: make: Update to 4.1
X-Git-Tag: v2.17-core93~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b4f445d2fcba3bd9937c60f3545934ddb82039c;p=ipfire-2.x.git

make: Update to 4.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/make b/config/rootfiles/packages/make
index 1b308be8cb..ebdca7ea29 100644
--- a/config/rootfiles/packages/make
+++ b/config/rootfiles/packages/make
@@ -1,14 +1,6 @@
 usr/bin/make
-#usr/info/make.info
-#usr/info/make.info-1
-#usr/info/make.info-10
-#usr/info/make.info-11
-#usr/info/make.info-2
-#usr/info/make.info-3
-#usr/info/make.info-4
-#usr/info/make.info-5
-#usr/info/make.info-6
-#usr/info/make.info-7
-#usr/info/make.info-8
-#usr/info/make.info-9
-#usr/man/man1/make.1
+#usr/include/gnumake.h
+#usr/share/info/make.info
+#usr/share/info/make.info-1
+#usr/share/info/make.info-2
+#usr/share/man/man1/make.1
diff --git a/lfs/make b/lfs/make
index 5650230f93..c8c2cb0097 100644
--- a/lfs/make
+++ b/lfs/make
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2015  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,14 +24,14 @@
 
 include Config
 
-VER        = 3.81
+VER        = 4.1
 
 THISAPP    = make-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = make
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -61,7 +61,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 354853e0b2da90c527e35aabb8d6f1e6
+$(DL_FILE)_MD5 = 654f9117957e6fa6a1c49a8f08270ec9
 
 install : $(TARGET)
 
@@ -93,7 +93,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@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