X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fhost.mk;h=ed961e35d91a662d4427166d4adcdc9731ea3ebd;hb=e158d8b6a7b3c883a8be74cb2327dda6374fc050;hp=abcf045d01e05327408dcb6e9bc8310b695ee74d;hpb=fa8f555b9dc6b1476a806acc191a58241875a7ea;p=openwrt-10.03%2F.git diff --git a/include/host.mk b/include/host.mk index abcf045d0..ed961e35d 100644 --- a/include/host.mk +++ b/include/host.mk @@ -5,9 +5,11 @@ # See /LICENSE for more information. # -include $(TOPDIR)/.host.mk +include $(TMP_DIR)/.host.mk -$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk +export TAR + +$(TMP_DIR)/.host.mk: $(INCLUDE_DIR)/host.mk @( \ HOST_OS=`uname`; \ case "$$HOST_OS" in \ @@ -20,8 +22,11 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk echo "HOST_OS:=$$HOST_OS" > $@; \ echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ - if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ - echo "TAR_WILDCARDS:=--wildcards" >> $@; \ - fi; \ + TAR=`which gtar`; \ + [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar`; \ + echo "TAR:=$$TAR" >> $@; \ + ZCAT=`which gzcat`; \ + [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \ + echo "ZCAT:=$$ZCAT" >> $@; \ )