diff options
| author | Loïc Hoguin <[email protected]> | 2015-05-15 11:34:12 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-05-15 11:34:12 +0300 |
| commit | ec976404fcb9873b7a10df9345960f0e8f74146c (patch) | |
| tree | 8824e0d028d6c1d9db50f9acee9c257bcc5e3b87 /core/deps.mk | |
| parent | a294038c83a631813af3708be3b986ef6a6e3468 (diff) | |
| download | erlang.mk-ec976404fcb9873b7a10df9345960f0e8f74146c.tar.gz erlang.mk-ec976404fcb9873b7a10df9345960f0e8f74146c.tar.bz2 erlang.mk-ec976404fcb9873b7a10df9345960f0e8f74146c.zip | |
Add another test for rebar detection
If we can't find "rebar" in the Makefile, we now try 'make -n'
and check the output. This will catch cases where the "rebar"
stuff is defined in included files.
Diffstat (limited to 'core/deps.mk')
| -rw-r--r-- | core/deps.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/deps.mk b/core/deps.mk index 1d767cf..4b31be6 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -62,6 +62,8 @@ define dep_autopatch if [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \ if [ 0 != `grep -ci rebar $(DEPS_DIR)/$(1)/Makefile` ]; then \ $(call dep_autopatch2,$(1)); \ + elif [ 0 != `cd $(DEPS_DIR)/$(1)/ && make -n | grep -ci rebar` ]; then \ + $(call dep_autopatch2,$(1)); \ else \ $(call dep_autopatch_erlang_mk,$(1)); \ fi \ |