Keep the version hardcoded in mix.exs file

Generated the mix.exs file through configure is not possible when using mix, as
it does not run configure after having downloaded the dependencies.
#621

diff --git a/.gitignore b/.gitignore
index d44a41f3f5a9d9cd6c89c9354c77300f6461fb46..21f8cfadaa35772610c3e2d083461b2b83491e28 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,3 @@ XmppAddr.hrl
 /test/*.beam
 /logs/
 /priv/sql
-mix.exs

diff --git a/configure.ac b/configure.ac
index 6ae0a2455b1cfb121619a75173d7116dedc387da..a3e26384bf22035822e49f859b7cac17c675193b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -235,8 +235,7 @@ esac],[if test "x$lager" = "x"; then lager=true; fi])
 
 AC_CONFIG_FILES([Makefile
                 vars.config
-                src/ejabberd.app.src
-                mix.exs])
+                src/ejabberd.app.src])
 
 ENABLEUSER=""
 AC_ARG_ENABLE(user,

diff --git a/mix.exs.in b/mix.exs
similarity index 98%
rename from mix.exs.in
rename to mix.exs
index d7b236e01772ede05d8565917c128ac1ae7bd753..c93a0881133c8fe17a34acb9fb948475c21dc211 100644 (file)
--- a/mix.exs.in
+++ b/mix.exs
@@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "@PACKAGE_VERSION@",
+     version: "15.06",
      elixir: "~> 1.0",
      elixirc_paths: ["lib"],
      compile_path: ".",