mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-20 16:15:59 +01:00
Merge pull request #3668 from longlene/master
rebar version get minor fix
This commit is contained in:
commit
d967103d89
10
Makefile.in
10
Makefile.in
@ -99,12 +99,12 @@ ifneq ($(INSTALLGROUP),)
|
||||
endif
|
||||
|
||||
ifeq "$(MIX)" "mix"
|
||||
IS_REBAR:=6
|
||||
REBAR_VER:=6
|
||||
else
|
||||
IS_REBAR:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'`)
|
||||
REBAR_VER:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}')
|
||||
endif
|
||||
|
||||
ifeq "$(IS_REBAR)" "6"
|
||||
ifeq "$(REBAR_VER)" "6"
|
||||
REBAR=$(MIX)
|
||||
SKIPDEPS=
|
||||
LISTDEPS=deps.tree
|
||||
@ -118,7 +118,7 @@ ifeq "$(IS_REBAR)" "6"
|
||||
REBARREL=MIX_ENV=prod $(REBAR) release --overwrite
|
||||
REBARDEV=MIX_ENV=dev $(REBAR) release --overwrite
|
||||
else
|
||||
ifeq "$(IS_REBAR)" "3"
|
||||
ifeq "$(REBAR_VER)" "3"
|
||||
SKIPDEPS=
|
||||
LISTDEPS=tree
|
||||
UPDATEDEPS=upgrade
|
||||
@ -398,7 +398,7 @@ TAGS:
|
||||
|
||||
Makefile: Makefile.in
|
||||
|
||||
ifeq "$(IS_REBAR)" "3"
|
||||
ifeq "$(REBAR_VER)" "3"
|
||||
dialyzer:
|
||||
$(REBAR) dialyzer
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user