Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Fix 'make update' when used with rebar 3.18

This commit is contained in:
Paweł Chmielowski 2022-01-03 13:51:49 +01:00
parent 59c9500944
commit dc81966938
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -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