25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Merge pull request #3668 from longlene/master

rebar version get minor fix
This commit is contained in:
badlop 2021-08-27 13:23:56 +02:00 committed by GitHub
commit d967103d89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -99,12 +99,12 @@ ifneq ($(INSTALLGROUP),)
endif endif
ifeq "$(MIX)" "mix" ifeq "$(MIX)" "mix"
IS_REBAR:=6 REBAR_VER:=6
else else
IS_REBAR:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'`) REBAR_VER:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}')
endif endif
ifeq "$(IS_REBAR)" "6" ifeq "$(REBAR_VER)" "6"
REBAR=$(MIX) REBAR=$(MIX)
SKIPDEPS= SKIPDEPS=
LISTDEPS=deps.tree LISTDEPS=deps.tree
@ -118,7 +118,7 @@ ifeq "$(IS_REBAR)" "6"
REBARREL=MIX_ENV=prod $(REBAR) release --overwrite REBARREL=MIX_ENV=prod $(REBAR) release --overwrite
REBARDEV=MIX_ENV=dev $(REBAR) release --overwrite REBARDEV=MIX_ENV=dev $(REBAR) release --overwrite
else else
ifeq "$(IS_REBAR)" "3" ifeq "$(REBAR_VER)" "3"
SKIPDEPS= SKIPDEPS=
LISTDEPS=tree LISTDEPS=tree
UPDATEDEPS=upgrade UPDATEDEPS=upgrade
@ -398,7 +398,7 @@ TAGS:
Makefile: Makefile.in Makefile: Makefile.in
ifeq "$(IS_REBAR)" "3" ifeq "$(REBAR_VER)" "3"
dialyzer: dialyzer:
$(REBAR) dialyzer $(REBAR) dialyzer
else else