diff options
| author | Paweł Chmielowski <pawel@process-one.net> | 2021-07-22 15:47:35 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pawel@process-one.net> | 2021-07-22 15:51:43 +0200 |
| commit | c96de092feb2c750a7a1661381f1aeb462656cd4 (patch) | |
| tree | 343d1a07715819b1e102a58f1acb4d774cf65b50 /Makefile.in | |
| parent | Remove leading zeros in ejabberd version number to satisfy Elixir SemVer (diff) | |
Revert "Add workaround so rebar2 can use Elixir 1.12.0"21.07
This reverts commit 937e1c2e373e360fe47e455886d186492248f31f.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index ac8c0b453..c39195ac7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,7 +130,6 @@ ifeq "$(IS_REBAR)" "3" EBINDIR=$(DEPSDIR)/ejabberd/ebin REBARREL=$(REBAR) as prod tar REBARDEV=REBAR_PROFILE=dev $(REBAR) release - ELIXIR_WARNING="\033[32m===>\033[00m If you get \033[1;91mDependency failure: source for elixir...\033[00m, please run \033[4;37mmake\033[00m again" else SKIPDEPS=skip_deps=true LISTDEPS=-q list-deps @@ -143,23 +142,12 @@ else EBINDIR=ebin REBARREL=$(REBAR) generate REBARDEV= - ELIXIR_WARNING="\033[32m===>\033[00m If you get \033[1;91mERROR: Dependency dir .../elixir failed...\033[00m, please run \033[4;37mmake\033[00m again" endif endif all: deps src -deps: elixir-rebar $(DEPSDIR)/.got - -elixir-rebar: - @[ @elixir@ = true ] \ - && ( [ ! -d $(DEPSDIR)/elixir/ ] \ - && echo $(ELIXIR_WARNING) \ - || ( [ ! -f $(DEPSDIR)/elixir/rebar.config ] \ - && { mkdir $(DEPSDIR)/elixir/src ; \ - cp lib/elixir.app.src $(DEPSDIR)/elixir/src/ ; \ - cp lib/rebar.config $(DEPSDIR)/elixir/ ; } \ - || true ) ) || true +deps: $(DEPSDIR)/.got $(DEPSDIR)/.got: rm -rf $(DEPSDIR)/.got |