From b202004862d8fee390fef85c0d7e239c0700de52 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Sun, 1 May 2016 21:29:59 +0200 Subject: [PATCH] ejabberdctl: Fix path to epmd --- Makefile.in | 1 + configure.ac | 1 + ejabberdctl.template | 2 +- vars.config.in | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 0d9134485..b08eb444a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -185,6 +185,7 @@ install: all copy-files -e "s*{{localstatedir}}*@localstatedir@*" \ -e "s*{{docdir}}*@docdir@*" \ -e "s*{{erl}}*@ERL@*" ejabberdctl.template \ + -e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \ > ejabberdctl.example [ -f $(ETCDIR)/ejabberdctl.cfg ] \ && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ diff --git a/configure.ac b/configure.ac index e5d92c89d..f3ff9ae54 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ fi AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH]) AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH]) +AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH]) AC_ERLANG_NEED_ERL AC_ERLANG_NEED_ERLC diff --git a/ejabberdctl.template b/ejabberdctl.template index 2ee776118..7a3b589b9 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template @@ -13,7 +13,7 @@ ERLANG_NODE=ejabberd@localhost SCRIPT_DIR=`cd ${0%/*} && pwd` ERL={{erl}} IEX={{bindir}}/iex -EPMD={{bindir}}/epmd +EPMD={{epmd}} INSTALLUSER={{installuser}} ERL_LIBS={{libdir}} diff --git a/vars.config.in b/vars.config.in index 44316f8ae..57fade8d7 100644 --- a/vars.config.in +++ b/vars.config.in @@ -40,6 +40,7 @@ {sysconfdir, "{{release_dir}}/etc"}. {installuser, "@INSTALLUSER@"}. {erl, "{{release_dir}}/{{erts_vsn}}/bin/erl"}. +{epmd, "{{release_dir}}/{{erts_vsn}}/bin/epmd"}. {localstatedir, "{{release_dir}}/var"}. {libdir, "{{release_dir}}/lib"}. {docdir, "{{release_dir}}/doc"}.