add sysupgrade support for ar360w3g

[openwrt.git] / include / host.mk

diff --git a/include/host.mk b/include/host.mk
index 00eb1f5..b6a5824 100644 (file)
--- a/include/host.mk
+++ b/include/host.mk
@@ -8,7 +8,7 @@
 TMP_DIR ?= $(TOPDIR)/tmp
 -include $(TMP_DIR)/.host.mk
 
 TMP_DIR ?= $(TOPDIR)/tmp
 -include $(TMP_DIR)/.host.mk
 

-export TAR
+export TAR FIND

 
 ifneq ($(__host_inc),1)
 __host_inc:=1
 
 ifneq ($(__host_inc),1)
 __host_inc:=1


@@ -34,17 +34,16 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
                [ -n "$$FIND" -a -x "$$FIND" ] || FIND=`which find 2>/dev/null`; \
                echo "FIND:=$$FIND" >> $@; \
                echo "BASH:=$(shell which bash)" >> $@; \
                [ -n "$$FIND" -a -x "$$FIND" ] || FIND=`which find 2>/dev/null`; \
                echo "FIND:=$$FIND" >> $@; \
                echo "BASH:=$(shell which bash)" >> $@; \

-               if find -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \
-                       echo 'FIND_L=find -L $$(1)' >>$@; \
+               if $$FIND -L /tmp -maxdepth 0 >/dev/null 2>/dev/null; then \
+                       echo "FIND_L=$$FIND -L \$$(1)" >>$@; \

                else \
                else \

-                       echo 'FIND_L=find $$(1) -follow' >> $@; \
+                       echo "FIND_L=$$FIND \$$(1) -follow" >> $@; \
+               fi; \
+               if xargs --help 2>&1 | grep 'gnu.org' >/dev/null; then \
+                       echo 'XARGS:=xargs -r' >> $@; \
+               else \
+                       echo 'XARGS:=xargs' >> $@; \

                fi; \
        )
 
 endif
                fi; \
        )
 
 endif

-
-ifeq ($(HOST_OS),Linux)
-  XARGS:=xargs -r
-else
-  XARGS:=xargs
-endif