From 82e8b16a3977049363e84a0483de21ca6bb772eb Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 17 Jul 2008 17:13:01 +0000
Subject: [PATCH] * src/Makefile.in: ejabberctl doesn't use the erl found by
 the configure script (EJAB-676) * src/ejabberdctl.template: Likewise

SVN Revision: 1459
---
 ChangeLog                | 6 ++++++
 src/Makefile.in          | 2 +-
 src/ejabberdctl.template | 9 +++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c7a91bdc..b097338c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-17  Badlop  <badlop@process-one.net>
+
+	* src/Makefile.in: ejabberctl doesn't use the erl found by the
+	configure script (EJAB-676)
+	* src/ejabberdctl.template: Likewise
+
 2008-07-17  Christophe Romain  <christophe.romain@process-one.net>
 
 	* src/web/Makefile.in: use -DSSL39 if compiling with R12 
diff --git a/src/Makefile.in b/src/Makefile.in
index f3d81f65d..a7215ba76 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -117,7 +117,7 @@ install: all
 	install -m 644 msgs/*.msg $(MSGSDIR)
 	install -d -m 750 $(ETCDIR)
 	[ -f $(ETCDIR)/ejabberd.cfg ] && install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new || install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-	sed -e "s*@rootdir@*@prefix@*" ejabberdctl.template > ejabberdctl.example
+	sed -e "s*@rootdir@*@prefix@*" -e "s*@erl@*@ERL@*" ejabberdctl.template > ejabberdctl.example
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] && install -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new || install -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
 	install -b -m 644 inetrc $(ETCDIR)/inetrc
 	install -d $(SBINDIR)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index ff2d32fc2..abc8b8c7a 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -11,6 +11,7 @@ ERL_MAX_ETS_TABLES=1400
 NODE=ejabberd
 HOST=localhost
 ERLANG_NODE=$NODE@$HOST
+ERL=@erl@
 ROOTDIR=@rootdir@
 EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
 LOGS_DIR=$ROOTDIR/var/log/ejabberd/
@@ -74,7 +75,7 @@ export HOME
 # start server
 start ()
 {
-    erl \
+    $ERL \
       $NAME $ERLANG_NODE \
       -noinput -detached \
       -pa $EJABBERD_EBIN \
@@ -103,7 +104,7 @@ debug ()
     echo "Press any key to continue"
     read foo
     echo ""
-    erl \
+    $ERL \
       $NAME ${NODE}debug \
       -remsh $ERLANG_NODE \
       $ERLANG_OPTS $ARGS "$@"
@@ -127,7 +128,7 @@ live ()
     echo "Press any key to continue"
     read foo
     echo ""
-    erl \
+    $ERL \
       $NAME $ERLANG_NODE \
       -pa $EJABBERD_EBIN \
       -mnesia dir "\"$EJABBERD_DB\"" \
@@ -138,7 +139,7 @@ live ()
 # common control function
 ctl ()
 {
-    erl \
+    $ERL \
       $NAME ejabberdctl \
       -noinput \
       -pa $EJABBERD_EBIN \