From: Peter Lemenkov <lemenkov@gmail.com>
Date: Wed, 17 Jul 2013 14:53:49 +0400
Subject: [PATCH] Install into BINDIR instead of SBINDIR
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/Makefile.in b/Makefile.in
index eb14749..75f7850 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,9 +14,6 @@ ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
# /bin/
BINDIR = $(DESTDIR)@bindir@
-# /sbin/
-SBINDIR = $(DESTDIR)@sbindir@
-
# /lib/
LIBDIR = $(DESTDIR)@libdir@
@@ -193,8 +190,8 @@ install: all copy-files
$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
#
# Administration script
- [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+ [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
+ $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl
# Elixir binaries
[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
@@ -202,7 +199,7 @@ install: all copy-files
[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
#
# Init script
- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
+ $(SED) -e "s*@ctlscriptpath@*$(BINDIR)*" \
-e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
> ejabberd.init
chmod 755 ejabberd.init
@@ -233,7 +230,7 @@ install: all copy-files
uninstall: uninstall-binary
uninstall-binary:
- rm -f $(SBINDIR)/ejabberdctl
+ rm -f $(BINDIR)/ejabberdctl
rm -f $(BINDIR)/iex
rm -f $(BINDIR)/elixir
rm -f $(BINDIR)/mix