From: Paweł Dorofiejczyk <pawel.dorofiejczyk@rst.com.pl>
Date: Thu, 25 Apr 2019 11:31:08 +0000 (+0200)
Subject: Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
X-Git-Tag: 19.05~41^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ab7390b9ce2dfd2213c181e31bad4402975fe19;p=ejabberd

Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency
---

diff --git a/mix.exs b/mix.exs
index f08a0c723..1cf7e3048 100644
--- 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