From e5599c8292d4e779167be565c89de84bd23d5c01 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Mon, 2 Jan 2017 22:35:03 -0500
Subject: [PATCH] Install into BINDIR instead of SBINDIR.
---
Makefile.in | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 5ff3efe0..b7bf0c4b 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@
@@ -189,8 +186,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
@@ -198,13 +195,13 @@ 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)*g" \
+ $(SED) -e "s*@ctlscriptpath@*$(BINDIR)*g" \
-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
> ejabberd.init
chmod 755 ejabberd.init
#
# Service script
- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
+ $(SED) -e "s*@ctlscriptpath@*$(BINDIR)*g" ejabberd.service.template \
> ejabberd.service
chmod 644 ejabberd.service
#
@@ -234,7 +231,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
--
2.11.0