Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

* src/Makefile.in: ejabberctl doesn't use the erl found by the

Browse Source 
configure script (EJAB-676)
* src/ejabberdctl.template: Likewise

SVN Revision: 1459
This commit is contained in:
Badlop 2008-07-17 17:13:01 +00:00
parent fc2ea76a45
commit 82e8b16a39
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2008-07-17 Christophe Romain <christophe.romain@process-one.net>
* src/web/Makefile.in: use -DSSL39 if compiling with R12 * src/web/Makefile.in: use -DSSL39 if compiling with R12

2
src/Makefile.in
View File

@ -117,7 +117,7 @@ install: all
install -m 644 msgs/*.msg $(MSGSDIR) install -m 644 msgs/*.msg $(MSGSDIR)
install -d -m 750 $(ETCDIR) 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 [ -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 [ -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 -b -m 644 inetrc $(ETCDIR)/inetrc
install -d $(SBINDIR) install -d $(SBINDIR)

9
src/ejabberdctl.template
View File

@ -11,6 +11,7 @@ ERL_MAX_ETS_TABLES=1400
NODE=ejabberd NODE=ejabberd
HOST=localhost HOST=localhost
ERLANG_NODE=$NODE@$HOST ERLANG_NODE=$NODE@$HOST
ERL=@erl@
ROOTDIR=@rootdir@ ROOTDIR=@rootdir@
EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
LOGS_DIR=$ROOTDIR/var/log/ejabberd/ LOGS_DIR=$ROOTDIR/var/log/ejabberd/
@ -74,7 +75,7 @@ export HOME
# start server # start server
start () start ()
{ {
erl \ $ERL \
$NAME $ERLANG_NODE \ $NAME $ERLANG_NODE \
-noinput -detached \ -noinput -detached \
-pa $EJABBERD_EBIN \ -pa $EJABBERD_EBIN \
@ -103,7 +104,7 @@ debug ()
echo "Press any key to continue" echo "Press any key to continue"
read foo read foo
echo "" echo ""
erl \ $ERL \
$NAME ${NODE}debug \ $NAME ${NODE}debug \
-remsh $ERLANG_NODE \ -remsh $ERLANG_NODE \
$ERLANG_OPTS $ARGS "$@" $ERLANG_OPTS $ARGS "$@"
@ -127,7 +128,7 @@ live ()
echo "Press any key to continue" echo "Press any key to continue"
read foo read foo
echo "" echo ""
erl \ $ERL \
$NAME $ERLANG_NODE \ $NAME $ERLANG_NODE \
-pa $EJABBERD_EBIN \ -pa $EJABBERD_EBIN \
-mnesia dir "\"$EJABBERD_DB\"" \ -mnesia dir "\"$EJABBERD_DB\"" \
@ -138,7 +139,7 @@ live ()
# common control function # common control function
ctl () ctl ()
{ {
erl \ $ERL \
$NAME ejabberdctl \ $NAME ejabberdctl \
-noinput \ -noinput \
-pa $EJABBERD_EBIN \ -pa $EJABBERD_EBIN \