From: Jan Lentfer Date: Sat, 16 Jun 2012 10:21:12 +0000 (+0200) Subject: m4: Update to 1.4.16. X-Git-Tag: v2.11-core61^2~34 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=f32b3974b4b7af91b898ec73ac66b23844e1b06d m4: Update to 1.4.16. This is a prerequisite for updating bison and flex Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/m4 b/config/rootfiles/common/m4 index ff224c1457..5e9acac223 100644 --- a/config/rootfiles/common/m4 +++ b/config/rootfiles/common/m4 @@ -1,2 +1,5 @@ #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 690f54a0cf..df4b6a9470 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -24,10 +24,10 @@ include Config -VER = 1.4.4 +VER = 1.4.16 THISAPP = m4-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -55,7 +55,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d1d64dbecf1494690a0f3ba8db4482a +$(DL_FILE)_MD5 = 8a7cef47fecab6272eb86a6be6363b2f install : $(TARGET) @@ -84,7 +84,7 @@ $(subst %,%_MD5,$(objects)) : $(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