m4: Update to 1.4.16.

This is a prerequisite for updating bison and flex

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

diff --git a/config/rootfiles/common/m4 b/config/rootfiles/common/m4
index ff224c1457c8bfccaa07e46ba2b66f7e78d53b81..5e9acac223e1f0db68797d2b4b8394bb128cc77c 100644 (file)
--- a/config/rootfiles/common/m4
+++ b/config/rootfiles/common/m4
@@ -1,2 +1,5 @@
 #usr/bin/m4
 #usr/bin/m4

-#usr/info/m4.info
+#usr/share/info/m4.info
+#usr/share/info/m4.info-1
+#usr/share/info/m4.info-2
+#usr/share/man/man1/m4.1

diff --git a/lfs/m4 b/lfs/m4
index 690f54a0cfeb3ab10615db7b2b303d2b25f3f55e..df4b6a9470aff719fe08da28cb46a00cdc429b6d 100644 (file)
--- a/lfs/m4
+++ b/lfs/m4
@@ -24,10 +24,10 @@
 
 include Config
 
 
 include Config
 

-VER        = 1.4.4
+VER        = 1.4.16

 
 THISAPP    = m4-$(VER)
 
 THISAPP    = m4-$(VER)

-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2

 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 


@@ -55,7 +55,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 8d1d64dbecf1494690a0f3ba8db4482a
+$(DL_FILE)_MD5 = 8a7cef47fecab6272eb86a6be6363b2f

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -84,7 +84,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)

-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

        cd $(DIR_APP) && LDFLAGS="$(EXTRA_LDFLAGS)" ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
        cd $(DIR_APP) && LDFLAGS="$(EXTRA_LDFLAGS)" ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install