diff options
| author | Loïc Hoguin <[email protected]> | 2016-11-19 10:53:31 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2016-11-19 11:01:27 +0100 |
| commit | a8fffe130e6ad047c2b04afe4fd1d3df532f0d1d (patch) | |
| tree | 6628731ae37a429a9f17ef85d344b00c52c9f450 /core/deps.mk | |
| parent | 9e9b7d2caa42c701f76efff06286ed046dc3fe90 (diff) | |
| download | erlang.mk-a8fffe130e6ad047c2b04afe4fd1d3df532f0d1d.tar.gz erlang.mk-a8fffe130e6ad047c2b04afe4fd1d3df532f0d1d.tar.bz2 erlang.mk-a8fffe130e6ad047c2b04afe4fd1d3df532f0d1d.zip | |
Don't autopatch if rebar is mentioned in comments
Diffstat (limited to 'core/deps.mk')
| -rw-r--r-- | core/deps.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/deps.mk b/core/deps.mk index 9acdee3..1964a52 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -111,9 +111,9 @@ define dep_autopatch elif [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \ if [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \ $(call dep_autopatch2,$(1)); \ - elif [ 0 != `grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \ + elif [ 0 != `grep -ci "^[^#].*rebar" $(DEPS_DIR)/$(1)/Makefile` ]; then \ $(call dep_autopatch2,$(1)); \ - elif [ -n "`find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk -exec grep -i rebar '{}' \;`" ]; then \ + elif [ -n "`find $(DEPS_DIR)/$(1)/ -type f -name \*.mk -not -name erlang.mk -exec grep -i "^[^#].*rebar" '{}' \;`" ]; then \ $(call dep_autopatch2,$(1)); \ else \ $(call erlang,$(call dep_autopatch_app.erl,$(1))); \ |