diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2015-05-29 09:30:16 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2015-05-29 09:30:16 +0200 |
| commit | 6cba7bf83459be24e384e016c017c639ecc8226c (patch) | |
| tree | f59ee7fb0dc39d9538e973c546bfeb491eab9130 | |
| parent | Validate MUC room options from the configuration file (diff) | |
Add correct package version for mix (#577)
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | mix.exs.in (renamed from mix.exs) | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 21f8cfada..d44a41f3f 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ XmppAddr.hrl /test/*.beam /logs/ /priv/sql +mix.exs diff --git a/configure.ac b/configure.ac index a3e26384b..6ae0a2455 100644 --- a/configure.ac +++ b/configure.ac @@ -235,7 +235,8 @@ esac],[if test "x$lager" = "x"; then lager=true; fi]) AC_CONFIG_FILES([Makefile vars.config - src/ejabberd.app.src]) + src/ejabberd.app.src + mix.exs]) ENABLEUSER="" AC_ARG_ENABLE(user, @@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do def project do [app: :ejabberd, - version: "15.03.0", + version: "@PACKAGE_VERSION@", elixir: "~> 1.0", elixirc_paths: ["lib"], compile_path: ".", @@ -65,7 +65,7 @@ defmodule Mix.Tasks.Compile.Asn1 do options = options ++ [:noobj, outdir: Erlang.to_erl_file(Path.dirname(output))] case :asn1ct.compile(Erlang.to_erl_file(input), options) do :ok -> {:ok, :done} - error -> error + error -> error end end) end |