$NetBSD: patch-ae,v 1.6 2010/09/03 10:31:43 fhajny Exp $ --- src/ejabberdctl.template.orig 2010-08-02 16:33:20.000000000 +0000 +++ src/ejabberdctl.template @@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; fi [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" if [ "$LOGS_DIR" = "" ] ; then - LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd + LOGS_DIR=@EJABBERD_LOGDIR@ fi if [ "$SPOOLDIR" = "" ] ; then - SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd + SPOOLDIR=@EJABBERD_DB@ fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH=@DOCDIR@ @@ -86,7 +86,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_ # define additional environment variables if [ "$EJABBERDDIR" = "" ]; then - EJABBERDDIR=@LIBDIR@/ejabberd + EJABBERDDIR=@LIBDIR@/erlang/lib/@DISTNAME@ fi if [ "$EJABBERD_EBIN_PATH" = "" ]; then EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin @@ -237,7 +237,7 @@ ctl () # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 - CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl + CONNLOCKDIR=@EJABBERD_PIDDIR@ FLOCK='/usr/bin/flock' if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then JOT='/usr/bin/jot'