From: Christophe Romain <christophe.romain@process-one.net>
Date: Fri, 7 Apr 2017 10:09:43 +0000 (+0200)
Subject: Generate ejabberd lib dir when not available in code server (#1665)
X-Git-Tag: 17.04~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36e3f4bc2a15be96014b1194bfa2a2f9b146958a;p=ejabberd

Generate ejabberd lib dir when not available in code server (#1665)

This is the case if running ejabberd from development directory
when code:lib_dir(ejabberd) returns {error, nad_name}.
---

diff --git a/src/ext_mod.erl b/src/ext_mod.erl
index bff9781ff..fe6813632 100644
--- a/src/ext_mod.erl
+++ b/src/ext_mod.erl
@@ -541,9 +541,22 @@ compile_result(Results) ->
 
 compile_options() ->
     [verbose, report_errors, report_warnings]
-    ++ [{i, filename:join(code:lib_dir(App), "include")}
+    ++ [{i, filename:join(app_dir(App), "include")}
         || App <- [fast_xml, xmpp, ejabberd]].
 
+app_dir(App) ->
+    case code:lib_dir(App) of
+        {error, bad_name} ->
+            case code:which(App) of
+                Beam when is_list(Beam) ->
+                    filename:dirname(filename:dirname(Beam));
+                _ ->
+                    "."
+            end;
+        Dir ->
+            Dir
+    end.
+
 compile_erlang_file(Dest, File) ->
     compile_erlang_file(Dest, File, compile_options()).