From f7fb3bff2f06606d74f2d23a1e534f94a9427ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Thu, 19 Nov 2015 14:31:58 +0100 Subject: [PATCH] Update erlang.mk --- deps/rabbitmq_mqtt/erlang.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/rabbitmq_mqtt/erlang.mk b/deps/rabbitmq_mqtt/erlang.mk index 79813e5cd3..c9ee04f49c 100644 --- a/deps/rabbitmq_mqtt/erlang.mk +++ b/deps/rabbitmq_mqtt/erlang.mk @@ -16,7 +16,7 @@ ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST))) -ERLANG_MK_VERSION = 1.2.0-849-g93261ea-dirty +ERLANG_MK_VERSION = 1.2.0-849-g29268fc-dirty # Core configuration. @@ -6473,7 +6473,7 @@ endif $(verbose) for dep in $^ ; do \ if ! grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/$@.log; then \ echo $$dep >> $(ERLANG_MK_TMP)/$@.log; \ - if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(|.*/)erlang\.mk$$" \ + if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \ $$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \ $(MAKE) -C $$dep $@ IS_DEP=1 || exit $$?; \ fi \ @@ -6537,7 +6537,7 @@ ifndef IS_APP done endif $(verbose) for dep in $(filter-out $(CURDIR),$(LIST_DIRS)); do \ - if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(|.*/)erlang\.mk$$" \ + if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \ $$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \ $(MAKE) -C "$$dep" --no-print-directory $@ IS_DEP=1; \ fi; \