From 6cba7bf83459be24e384e016c017c639ecc8226c Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Fri, 29 May 2015 09:30:16 +0200 Subject: [PATCH] Add correct package version for mix (#577) --- .gitignore | 1 + configure.ac | 3 ++- mix.exs => mix.exs.in | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) rename mix.exs => mix.exs.in (97%) 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, diff --git a/mix.exs b/mix.exs.in similarity index 97% rename from mix.exs rename to mix.exs.in index c52364737..d7b236e01 100644 --- a/mix.exs +++ b/mix.exs.in @@ -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