]> granicus.if.org Git - ejabberd/commitdiff
Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
authorPaweł Dorofiejczyk <pawel.dorofiejczyk@rst.com.pl>
Thu, 25 Apr 2019 11:31:08 +0000 (13:31 +0200)
committerPaweł Dorofiejczyk <pawel.dorofiejczyk@rst.com.pl>
Thu, 25 Apr 2019 11:31:08 +0000 (13:31 +0200)
mix.exs

diff --git a/mix.exs b/mix.exs
index f08a0c72370b8520fe705c53b91c2a80e2d62478..1cf7e3048aaa5e1da866289884b19b30da3ac05f 100644 (file)
--- 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