diff options
| author | Loïc Hoguin <[email protected]> | 2014-07-22 14:42:53 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-07-22 14:42:53 +0200 |
| commit | ff2bb6a25a44dd34e32f874039c4a694dbc9a488 (patch) | |
| tree | 32cab055681eb8d5f63755e71d3b2ddb5c09a8a5 | |
| parent | e270548ae9b729639789faf8f6ca208cbfa3a81f (diff) | |
| parent | 8d3313b8b36728c159a577f17349d63aaa6badd3 (diff) | |
| download | erlang.mk-ff2bb6a25a44dd34e32f874039c4a694dbc9a488.tar.gz erlang.mk-ff2bb6a25a44dd34e32f874039c4a694dbc9a488.tar.bz2 erlang.mk-ff2bb6a25a44dd34e32f874039c4a694dbc9a488.zip | |
Merge branch 'patch-71' of git://github.com/andreineculau/erlang.mk
| -rw-r--r-- | core/deps.mk | 2 | ||||
| -rw-r--r-- | erlang.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/deps.mk b/core/deps.mk index 9491b3f..2ddf5d4 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 ; \ @@ -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 ; \ |