From 81d881318ed7e4966ed9f9f00521066660ed7191 Mon Sep 17 00:00:00 2001 From: Randy Barlow <randy@electronsweatshop.com> Date: Tue, 8 Jan 2019 11:56:28 -0500 Subject: [PATCH] Install to bindir instead of sbindir. Signed-off-by: Randy Barlow <randy@electronsweatshop.com> --- Makefile.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index b6e3396..5d3a698 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@ @@ -252,8 +249,8 @@ install: 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 $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(BINDIR)/iex || true @@ -261,13 +258,13 @@ install: copy-files [ -f $(DEPSDIR)/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/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 # @@ -298,7 +295,7 @@ install: 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
