From 28ef7a6a9e782410811e7733f27ec85b4ba0fe19 Mon Sep 17 00:00:00 2001 From: Marcel Lorenz Date: Tue, 23 Feb 2016 08:46:23 +0100 Subject: [PATCH] m4: update to 1.4.17 Update m4 to last version from Linux from Scratch. Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer --- lfs/m4 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lfs/m4 b/lfs/m4 index 4620221959..932cb6d519 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -24,10 +24,10 @@ include Config -VER = 1.4.16 +VER = 1.4.17 THISAPP = m4-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -37,12 +37,10 @@ ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --disable-nls EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=/tools --disable-nls EXTRA_MAKE = - EXTRA_INSTALL = endif ############################################################################### @@ -53,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8a7cef47fecab6272eb86a6be6363b2f +$(DL_FILE)_MD5 = 12a3c829301a4fd6586a57d3fcf196dc install : $(TARGET) @@ -82,9 +80,9 @@ $(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 + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.2