From 1e68438b58553a9be111d298efcaf3f1ad96fc11 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 25 Jan 2009 19:00:43 +0000 Subject: improve support for building on mac os x by improving detection of missing components git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14180 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/Makefile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'tools/Makefile') diff --git a/tools/Makefile b/tools/Makefile index e24044d17..f2e4bafbf 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,23 +27,20 @@ $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ touch $@ -$(STAGING_DIR_HOST)/bin/md5sum: $(STAGING_DIR)/.prepared - @MD5SUM=`which md5sum 2>/dev/null`; \ - if [ "$@" != "$$MD5SUM" ]; then \ - if [ -x "$$MD5SUM" ]; then \ - ln -sf "$$MD5SUM" "$@"; \ - else \ - cp $(SCRIPT_DIR)/md5sum $(STAGING_DIR_HOST)/bin/; \ - fi; \ - fi - -$(STAGING_DIR_HOST)/bin/find: $(STAGING_DIR)/.prepared - if [ -x "$(FIND)" -a "$(FIND)" != "$@" ]; then \ - ln -sf "$(FIND)" $@; \ - fi - - -$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum) +define PrepareCommand +$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared + @mkdir -p "$$(dir $$@)"; rm -f "$$@" + @export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \ + echo "Command $(1) not found."; false; \ + }; ln -s "$$$$FILE" "$$@" + +endef + +$(eval $(call PrepareCommand,find,gfind find)) +$(eval $(call PrepareCommand,md5sum,md5sum $(SCRIPT_DIR)/md5sum)) +$(eval $(call PrepareCommand,cp,gcp cp)) + +$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp) $(curdir)//prepare = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) $(curdir)//compile = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) -- cgit v1.2.3