X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fm4;h=932cb6d519e7f46e0ac7d7013fa7fd0bc3cd066d;hb=2524577db810a73e044fbb7acfc7b67108e59915;hp=462022195999eb83e21ca4ff961b588a751eaf61;hpb=5e0a1a503b90c5c80016399308bb2585edba219b;p=ipfire-2.x.git 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)