From dfb186c781493e8c88ea396ec1c540a3bda68105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sat, 16 May 2015 15:17:36 +0300 Subject: Ignore Makefiles that include non-existing .mk files --- core/deps.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/deps.mk') diff --git a/core/deps.mk b/core/deps.mk index 86c196a..dfbe5ce 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -60,7 +60,9 @@ distclean:: distclean-deps distclean-pkg # in practice only Makefile is needed so far. define dep_autopatch if [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \ - if [ 0 != `grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \ + if [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \ + $(call dep_autopatch2,$(1)); \ + elif [ 0 != `grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \ $(call dep_autopatch2,$(1)); \ elif [ 0 != `find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk | xargs grep -ci rebar` ]; then \ $(call dep_autopatch2,$(1)); \ -- cgit v1.2.3