mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Fix 'make update' when used with rebar 3.18
This commit is contained in:
parent
59c9500944
commit
dc81966938
@ -94,8 +94,10 @@ endif
|
|||||||
|
|
||||||
ifeq "$(MIX)" "mix"
|
ifeq "$(MIX)" "mix"
|
||||||
REBAR_VER:=6
|
REBAR_VER:=6
|
||||||
|
REBAR_VER_318:=0
|
||||||
else
|
else
|
||||||
REBAR_VER:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}')
|
REBAR_VER:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}')
|
||||||
|
REBAR_VER_318:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print ($$2 == 3 && $$3 >= 18 ? 1 : 0)}')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq "$(REBAR_VER)" "6"
|
ifeq "$(REBAR_VER)" "6"
|
||||||
@ -115,7 +117,11 @@ else
|
|||||||
ifeq "$(REBAR_VER)" "3"
|
ifeq "$(REBAR_VER)" "3"
|
||||||
SKIPDEPS=
|
SKIPDEPS=
|
||||||
LISTDEPS=tree
|
LISTDEPS=tree
|
||||||
|
ifeq "$(REBAR_VER_318)" "1"
|
||||||
|
UPDATEDEPS=upgrade --all
|
||||||
|
else
|
||||||
UPDATEDEPS=upgrade
|
UPDATEDEPS=upgrade
|
||||||
|
endif
|
||||||
DEPSPATTERN="s/ (.*//; /^ / s/.* \([a-z0-9_]*\).*/\1/p;"
|
DEPSPATTERN="s/ (.*//; /^ / s/.* \([a-z0-9_]*\).*/\1/p;"
|
||||||
DEPSBASE=_build
|
DEPSBASE=_build
|
||||||
DEPSDIR=$(DEPSBASE)/default/lib
|
DEPSDIR=$(DEPSBASE)/default/lib
|
||||||
|
Loading…
Reference in New Issue
Block a user