X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Ftar;h=2cca09935ce35dc7c758ad20b1422a917a5e973b;hb=c19196e1c51d2a5a3a2a762e8d81c253dd5dd79d;hp=b1ef2fc9831ca92d382c866aaca2ef0b9629738b;hpb=39251a4c004c8a31cf4f0497bfd5b75bfccbb14e;p=ipfire-2.x.git diff --git a/lfs/tar b/lfs/tar index b1ef2fc983..2cca09935c 100644 --- a/lfs/tar +++ b/lfs/tar @@ -24,14 +24,14 @@ include Config -VER = 1.22 +VER = 1.28 THISAPP = tar-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -# Normal build or /tools build. +# Normal build or $(TOOLS_DIR) build. # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,7 +41,7 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls + EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls EXTRA_MAKE = EXTRA_INSTALL = endif @@ -54,7 +54,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 07fa517027f426bb80f5f5ff91b63585 +$(DL_FILE)_MD5 = 8f32b2bc1ed7ddf4cf4e4a39711341b0 install : $(TARGET) @@ -84,7 +84,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) + cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) FORCE_UNSAFE_CONFIGURE=1 cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install @rm -rf $(DIR_APP)