[sr-dev] git:master:3f3cdf71: Merge pull request #1037 from ffontaine/master

GitHub noreply at github.com
Sun Mar 19 14:57:49 CET 2017


Module: kamailio
Branch: master
Commit: 3f3cdf712c0cd8c8d35f0126cd132a392ff0b2ca
URL: https://github.com/kamailio/kamailio/commit/3f3cdf712c0cd8c8d35f0126cd132a392ff0b2ca

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2017-03-19T14:57:43+01:00

Merge pull request #1037 from ffontaine/master

erlang: allow user to set ERLANG_xxxDIR

---

Modified: src/modules/erlang/Makefile

---

Diff:  https://github.com/kamailio/kamailio/commit/3f3cdf712c0cd8c8d35f0126cd132a392ff0b2ca.diff
Patch: https://github.com/kamailio/kamailio/commit/3f3cdf712c0cd8c8d35f0126cd132a392ff0b2ca.patch

---

diff --git a/src/modules/erlang/Makefile b/src/modules/erlang/Makefile
index e75176c..1886bd0 100644
--- a/src/modules/erlang/Makefile
+++ b/src/modules/erlang/Makefile
@@ -10,9 +10,12 @@ ERLANG=$(shell which erl)
 ifneq ($(ERLANG),)
 ERLANG_LIBDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1)
 ERLANG_INCDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1)
-else
+endif
+
+ifeq ($(ERLANG_LIBDIR)$(ERLANG_INCDIR),)
 $(error Not found Erlang)
 endif
+
 LIBS=-L$(ERLANG_LIBDIR) -lei -lpthread
 
 DEFS+=-I$(ERLANG_INCDIR)




More information about the sr-dev mailing list