diff options
| author | Loïc Hoguin <[email protected]> | 2017-05-15 14:37:40 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2017-05-15 14:37:40 +0200 |
| commit | 3f8688e0d0526b74993d64a166e9ba8559c687e4 (patch) | |
| tree | edeb6926266d2c05afd1ccd3f8133ef1c822c058 /core/deps-tools.mk | |
| parent | ecd4344f3ef7e1b12e6506dd0b5d6e644894b9e0 (diff) | |
| download | erlang.mk-3f8688e0d0526b74993d64a166e9ba8559c687e4.tar.gz erlang.mk-3f8688e0d0526b74993d64a166e9ba8559c687e4.tar.bz2 erlang.mk-3f8688e0d0526b74993d64a166e9ba8559c687e4.zip | |
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.
Diffstat (limited to 'core/deps-tools.mk')
| -rw-r--r-- | core/deps-tools.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |