From 3f8688e0d0526b74993d64a166e9ba8559c687e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 15 May 2017 14:37:40 +0200 Subject: Make autopatch of Erlang.mk projects less obtrusive We do not touch the erlang.mk file anymore. We only patch the Makefile to include the top-level Erlang.mk by changing the 'include erlang.mk' line to look for ERLANG_MK_FILENAME if it is defined. The modified Makefile can be committed safely. --- core/deps-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/deps-tools.mk') diff --git a/core/deps-tools.mk b/core/deps-tools.mk index de1cc2b..1ad9274 100644 --- a/core/deps-tools.mk +++ b/core/deps-tools.mk @@ -74,7 +74,7 @@ endif $(verbose) set -e; for dep in $^ ; do \ if ! grep -qs ^$$dep$$ $(ERLANG_MK_RECURSIVE_TMP_LIST); then \ echo $$dep >> $(ERLANG_MK_RECURSIVE_TMP_LIST); \ - if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk)$$" \ + if grep -qs -E "^[[:blank:]]*include[[:blank:]]+(erlang\.mk|.*/erlang\.mk|.*ERLANG_MK_FILENAME.*)$$" \ $$dep/GNUmakefile $$dep/makefile $$dep/Makefile; then \ $(MAKE) -C $$dep fetch-deps \ IS_DEP=1 \ -- cgit v1.2.3