diff --git a/doc/guide.html b/doc/guide.html index 314169e10..c429714fc 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -365,7 +365,7 @@ to install ejabberd.

The files and directories created are, by de

ejabberdctl.cfg
Configuration file of the administration script
inetrc
Network DNS configuration
-
/bin/ejabberdctl
Administration script (see section 4.1) +
/sbin/ejabberdctl
Administration script (see section 4.1)
/var/lib/ejabberd/
.erlang.cookie
Erlang cookie file (see section 5.3) diff --git a/doc/guide.tex b/doc/guide.tex index e7b908db1..faf37104e 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -366,7 +366,7 @@ The files and directories created are, by default: \titem{ejabberdctl.cfg} Configuration file of the administration script \titem{inetrc} Network DNS configuration \end{description} - \titem{/bin/ejabberdctl} Administration script (see section~\ref{ejabberdctl}) + \titem{/sbin/ejabberdctl} Administration script (see section~\ref{ejabberdctl}) \titem{/var/lib/ejabberd/} \begin{description} \titem{.erlang.cookie} Erlang cookie file (see section \ref{cookie}) diff --git a/src/Makefile.in b/src/Makefile.in index 0b5b27a26..6cb06c922 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -68,7 +68,7 @@ PBINDIR = $(PRIVDIR)/bin MSGSDIR = $(PRIVDIR)/msgs LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd -BINDIR = $(DESTDIR)@bindir@ +SBINDIR = $(DESTDIR)@sbindir@ ifeq ($(shell uname),Darwin) DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress @@ -132,7 +132,7 @@ install: all sed -e "s*@rootdir@*@prefix@*" -e "s*@installuser@*@INSTALLUSER@*" -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 -o @INSTALLUSER@ ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg install -b -m 644 inetrc $(ETCDIR)/inetrc - install -m 550 -o @INSTALLUSER@ ejabberdctl.example $(BINDIR)/ejabberdctl + install -m 550 -o @INSTALLUSER@ ejabberdctl.example $(SBINDIR)/ejabberdctl install -d -m 750 -o @INSTALLUSER@ $(LOGDIR) chown @INSTALLUSER@ $(COOKIEFILE) @@ -143,7 +143,7 @@ uninstall-binary: rm -rf $(SODIR) rm -rf $(MSGSDIR) rm -rf $(PRIVDIR) - rm -rf $(BINDIR)/ejabberdctl + rm -rf $(SBINDIR)/ejabberdctl uninstall-all: uninstall-binary rm -rf $(ETCDIR)