X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6c26dacd2ceccc533f8a05f9ec4a600793ec06e9..d110b89b7be2bcc140ecece3e855a288dd4cdfc0:/include/host.mk

diff --git a/include/host.mk b/include/host.mk
index 423ca1661..00eb1f55a 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -1,16 +1,18 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
-include $(TMP_DIR)/.host.mk
+TMP_DIR ?= $(TOPDIR)/tmp
+-include $(TMP_DIR)/.host.mk
 
 export TAR
 
 ifneq ($(__host_inc),1)
 __host_inc:=1
+.PRECIOUS: $(TMP_DIR)/.host.mk
 $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 	@mkdir -p $(TMP_DIR)
 	@( \
@@ -28,10 +30,21 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
 		TAR=`which gtar 2>/dev/null`; \
 		[ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
 		echo "TAR:=$$TAR" >> $@; \
-		ZCAT=`which gzcat 2>/dev/null`; \
-		[ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat 2>/dev/null`; \
-		echo "ZCAT:=$$ZCAT" >> $@; \
+		FIND=`which gfind 2>/dev/null`; \
+		[ -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)' >>$@; \
+		else \
+			echo 'FIND_L=find $$(1) -follow' >> $@; \
+		fi; \
 	)
 
 endif
+
+ifeq ($(HOST_OS),Linux)
+  XARGS:=xargs -r
+else
+  XARGS:=xargs
+endif