diff options
| author | Loïc Hoguin <[email protected]> | 2017-04-28 20:21:29 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2017-04-28 20:21:29 +0200 |
| commit | 59229696f08cc3328e09cc4b84db4fb92d3ddeec (patch) | |
| tree | 4e9a133b44bffd264c608bd77b1a03149057cf30 | |
| parent | a92e55ed7e16efd96488f6543f8f25f123e6f89e (diff) | |
| download | erlang.mk-59229696f08cc3328e09cc4b84db4fb92d3ddeec.tar.gz erlang.mk-59229696f08cc3328e09cc4b84db4fb92d3ddeec.tar.bz2 erlang.mk-59229696f08cc3328e09cc4b84db4fb92d3ddeec.zip | |
Consider all projects with a rebar.lock rebar projects
| -rw-r--r-- | core/deps.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/deps.mk b/core/deps.mk index 43632ed..f44e567 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -110,7 +110,9 @@ define dep_autopatch $(call erlang,$(call dep_autopatch_appsrc.erl,$(1))); \ $(call dep_autopatch_erlang_mk,$(1)); \ elif [ -f $(DEPS_DIR)/$(1)/Makefile ]; then \ - if [ 0 != `grep -c "include ../\w*\.mk" $(DEPS_DIR)/$(1)/Makefile` ]; then \ + if [ -f $(DEPS_DIR)/$1/rebar.lock ]; then \ + $(call dep_autopatch2,$1); \ + elif [ 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 \ $(call dep_autopatch2,$(1)); \ @@ -133,7 +135,7 @@ define dep_autopatch2 $(call erlang,$(call dep_autopatch_appsrc_script.erl,$(1))); \ fi; \ $(call erlang,$(call dep_autopatch_appsrc.erl,$(1))); \ - if [ -f $(DEPS_DIR)/$(1)/rebar -o -f $(DEPS_DIR)/$(1)/rebar.config -o -f $(DEPS_DIR)/$(1)/rebar.config.script ]; then \ + if [ -f $(DEPS_DIR)/$(1)/rebar -o -f $(DEPS_DIR)/$(1)/rebar.config -o -f $(DEPS_DIR)/$(1)/rebar.config.script -o -f $(DEPS_DIR)/$1/rebar.lock ]; then \ $(call dep_autopatch_fetch_rebar); \ $(call dep_autopatch_rebar,$(1)); \ else \ |