improve mtd image check - don't check trx header if the target partition is not ...

[openwrt-10.03/.git] / include / host.mk

diff --git a/include/host.mk b/include/host.mk
index abcf045d01e05327408dcb6e9bc8310b695ee74d..3100ce4165a32150d24e3863fa58a49048b1930d 100644 (file)
--- a/include/host.mk
+++ b/include/host.mk
@@ -7,6 +7,8 @@
 
 include $(TOPDIR)/.host.mk
 
+export TAR
+
 $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk
        @( \
                HOST_OS=`uname`; \
@@ -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" >> $@; \
        )