X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fm4;h=932cb6d519e7f46e0ac7d7013fa7fd0bc3cd066d;hb=7e39a893124da94f4e1cdec6e63d25ef57c18f59;hp=690f54a0cfeb3ab10615db7b2b303d2b25f3f55e;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=ipfire-2.x.git diff --git a/lfs/m4 b/lfs/m4 index 690f54a0cf..932cb6d519 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -24,10 +24,10 @@ include Config -VER = 1.4.4 +VER = 1.4.17 THISAPP = m4-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -36,15 +36,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --disable-nls - EXTRA_LDFLAGS = EXTRA_MAKE = - EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools EXTRA_CONFIG = --prefix=/tools --disable-nls - EXTRA_LDFLAGS = -static EXTRA_MAKE = - EXTRA_INSTALL = endif ############################################################################### @@ -55,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d1d64dbecf1494690a0f3ba8db4482a +$(DL_FILE)_MD5 = 12a3c829301a4fd6586a57d3fcf196dc install : $(TARGET) @@ -84,9 +80,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && LDFLAGS="$(EXTRA_LDFLAGS)" ./configure $(EXTRA_CONFIG) + @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)