Install ejabberdctl in /sbin as usual because it is a daemon, not a user program.

SVN Revision: 1440

diff --git a/doc/guide.html b/doc/guide.html
index 314169e10a77aae6ffd7b00ca0143c1575ef3d40..c429714fc928dd199c151deb783a5dc011ce1443 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -365,7 +365,7 @@ to install <TT>ejabberd</TT>.</P><P>The files and directories created are, by de
                        </DD><DT CLASS="dt-description"><B><TT>ejabberdctl.cfg</TT></B></DT><DD CLASS="dd-description"> Configuration file of the administration script
                        </DD><DT CLASS="dt-description"><B><TT>inetrc</TT></B></DT><DD CLASS="dd-description"> Network DNS configuration
                </DD></DL>
-       </DD><DT CLASS="dt-description"><B><TT>/bin/ejabberdctl</TT></B></DT><DD CLASS="dd-description"> Administration script (see section&#XA0;<A HREF="#ejabberdctl">4.1</A>)
+       </DD><DT CLASS="dt-description"><B><TT>/sbin/ejabberdctl</TT></B></DT><DD CLASS="dd-description"> Administration script (see section&#XA0;<A HREF="#ejabberdctl">4.1</A>)
        </DD><DT CLASS="dt-description"><B><TT>/var/lib/ejabberd/</TT></B></DT><DD CLASS="dd-description">
                <DL CLASS="description"><DT CLASS="dt-description">
                        <B><TT>.erlang.cookie</TT></B></DT><DD CLASS="dd-description"> Erlang cookie file (see section <A HREF="#cookie">5.3</A>)

diff --git a/doc/guide.tex b/doc/guide.tex
index e7b908db156eb99fbfb66b6f3298be6dc6fb2bdf..faf37104e89ee8475f7162166bf7e5b2b03485b6 100644 (file)
--- 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 0b5b27a2665b2d2fb8b584cd7e1ff47e69e40548..6cb06c92220a5e47a0ad6b10233283b44a367798 100644 (file)
--- 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)