diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-16 07:19:45 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-16 07:19:45 +0000 |
| commit | 9a6c0fcafd3475259d892d6ce95c6c6a8e6c37b9 (patch) | |
| tree | 17c72b94fb033fb233c65a8aa841513665b895d6 | |
| parent | c1a0aeea363bf79c9a2e59b8804acf46359179d2 (diff) | |
detect whether the find command supports -L or -follow
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8002 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/host.mk | 7 | ||||
| -rw-r--r-- | include/scan.mk | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/host.mk b/include/host.mk index 833aa83a6..cc0436e7b 100644 --- a/include/host.mk +++ b/include/host.mk @@ -5,7 +5,7 @@ # See /LICENSE for more information. # -include $(TMP_DIR)/.host.mk +-include $(TMP_DIR)/.host.mk export TAR @@ -29,6 +29,11 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \ echo "TAR:=$$TAR" >> $@; \ 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 diff --git a/include/scan.mk b/include/scan.mk index 04add4016..552f14637 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -1,7 +1,10 @@ include $(TOPDIR)/include/verbose.mk +TMP_DIR:=$(TOPDIR)/tmp all: tmp/.$(SCAN_TARGET) +include $(TOPDIR)/include/host.mk + SCAN_TARGET ?= packageinfo SCAN_NAME ?= package SCAN_DIR ?= package @@ -31,7 +34,7 @@ endef $(FILELIST): rm -f tmp/info/.files-$(SCAN_TARGET)-* - find -follow $(SCAN_DIR) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@ + $(call FIND_L, $(SCAN_DIR)) $(SCAN_EXTRA) -mindepth 1 $(if $(SCAN_DEPTH),-maxdepth $(SCAN_DEPTH)) -name Makefile | xargs grep -HE 'call (Build/DefaultTargets|KernelPackage|Build(Package|Kernel))' | sed -e 's#^$(SCAN_DIR)/##' -e 's#/Makefile:.*##' | uniq > $@ tmp/info/.files-$(SCAN_TARGET).mk: $(FILELIST) ( \ |