Browse Source

Merge branch 'patch-71' of git://github.com/andreineculau/erlang.mk

Loïc Hoguin 11 years ago
parent
commit
ff2bb6a25a
2 changed files with 3 additions and 3 deletions
  1. 1 1
      core/deps.mk
  2. 2 2
      erlang.mk

+ 1 - 1
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 ; \

+ 2 - 2
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 ; \