projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a packaging method that installs files into a subdirectory of bin/ instead of...
[openwrt-10.03/.git]
/
include
/
host.mk
diff --git
a/include/host.mk
b/include/host.mk
index 4a434711c3c8649c259cb3826aacb53fd9547c8d..d163c997dde41b75c89e3551fd3fe83f5e566fbe 100644
(file)
--- a/
include/host.mk
+++ b/
include/host.mk
@@
-1,14
+1,18
@@
#
#
-# Copyright (C) 200
6
OpenWrt.org
+# Copyright (C) 200
7
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
#
# 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
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)
@( \
$(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
@mkdir -p $(TMP_DIR)
@( \
@@
-26,9
+30,18
@@
$(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" >> $@; \
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" >> $@; \
echo "BASH:=$(shell which bash)" >> $@; \
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