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

Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
2019-05-02 11:53:35 +02:00 · 2019-05-02 11:53:35 +02:00 · 1ec3525ed6
parent 492da2baac 7ab7390b9c
commit 1ec3525ed6
1 changed files with 7 additions and 3 deletions
--- a/mix.exs
+++ b/mix.exs
@ -96,9 +96,13 @@ defmodule Ejabberd.Mixfile do
  end

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