Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Merge pull request #2869 from rstgroup/fix-elixir-umbrella-compilation

Browse Source 
Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
This commit is contained in:
Mickaël Rémond 2019-05-02 11:53:35 +02:00 committed by GitHub
commit 1ec3525ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mix.exs
View File

@ -96,10 +96,14 @@ defmodule Ejabberd.Mixfile do
end end
defp deps_include(deps) do defp deps_include(deps) do
base = case Mix.Project.deps_paths()[:ejabberd] do base = if Mix.Project.umbrella?() do
"../../deps"
else
case Mix.Project.deps_paths()[:ejabberd] do
nil -> "deps" nil -> "deps"
_ -> ".." _ -> ".."
end end
end
Enum.map(deps, fn dep -> base<>"/#{dep}/include" end) Enum.map(deps, fn dep -> base<>"/#{dep}/include" end)
end end