From 8d3313b8b36728c159a577f17349d63aaa6badd3 Mon Sep 17 00:00:00 2001 From: Andrei Neculau Date: Tue, 22 Jul 2014 14:33:18 +0200 Subject: Improve detection of dependency support for make --- core/deps.mk | 2 +- erlang.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/deps.mk b/core/deps.mk index 27eefe5..bda6bed 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -31,7 +31,7 @@ PKG_FILE_URL ?= https://raw.githubusercontent.com/extend/erlang.mk/master/packag deps:: $(ALL_DEPS_DIRS) @for dep in $(ALL_DEPS_DIRS) ; do \ - if [ -f $$dep/Makefile ] ; then \ + if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \ $(MAKE) -C $$dep ; \ else \ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \ diff --git a/erlang.mk b/erlang.mk index d29632c..5173da9 100644 --- a/erlang.mk +++ b/erlang.mk @@ -183,7 +183,7 @@ $(foreach dep,$(DEPS),$(eval $(call dep_target,$(dep)))) deps: $(ALL_DEPS_DIRS) @for dep in $(ALL_DEPS_DIRS) ; do \ - if [ -f $$dep/Makefile ] ; then \ + if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \ $(MAKE) -C $$dep ; \ else \ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep ; \ @@ -192,7 +192,7 @@ deps: $(ALL_DEPS_DIRS) clean-deps: @for dep in $(ALL_DEPS_DIRS) ; do \ - if [ -f $$dep/Makefile ] ; then \ + if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ] ; then \ $(MAKE) -C $$dep clean ; \ else \ echo "include $(CURDIR)/erlang.mk" | $(MAKE) -f - -C $$dep clean ; \ -- cgit v1.2.3