diff options
| author | Randy Barlow <randy@electronsweatshop.com> | 2016-02-14 11:47:49 -0500 |
|---|---|---|
| committer | Randy Barlow <randy@electronsweatshop.com> | 2016-02-14 11:47:49 -0500 |
| commit | 016418b889d3de8177ab79974b50ace3316af3f2 (patch) | |
| tree | 7966f636e8be04a24cf56228eba288ef7077de26 | |
| parent | 6f00c58c22ea629ca90264d21e66c55690f43e8d (diff) | |
| download | ejabberd-016418b889d3de8177ab79974b50ace3316af3f2.tar.gz ejabberd-016418b889d3de8177ab79974b50ace3316af3f2.tar.xz ejabberd-016418b889d3de8177ab79974b50ace3316af3f2.zip | |
Update patch 0007 for ejabberd 15.11.
| -rw-r--r-- | ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch b/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch index 7a0e178..f977b1d 100644 --- a/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch +++ b/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch @@ -1,32 +1,28 @@ -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 de47be2..037d2ff 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -11,8 +11,8 @@ DESTDIR = - # /etc/ejabberd/ - ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd +--- b/Makefile.in 2015-12-25 23:25:50.462000000 -0500 ++++ a/Makefile.in 2015-12-26 00:03:06.226000000 -0500 +@@ -14,9 +14,6 @@ + # /bin/ + BINDIR = $(DESTDIR)@bindir@ -# /sbin/ -SBINDIR = $(DESTDIR)@sbindir@ -+# /bin/ -+BINDIR = $(DESTDIR)@bindir@ +- + # /lib/ + LIBDIR = $(DESTDIR)@libdir@ - # /lib/ejabberd/ - EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd -@@ -126,11 +126,11 @@ install: all +@@ -159,8 +156,8 @@ $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc # # Administration script - [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) -- $(INSTALL) -m 755 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl +- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl + [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) -+ $(INSTALL) -m 755 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl ++ $(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 +@@ -168,7 +165,7 @@ + [ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true # # Init script - $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \ @@ -34,12 +30,12 @@ index de47be2..037d2ff 100644 -e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \ > ejabberd.init chmod 755 ejabberd.init -@@ -191,7 +191,7 @@ install: all +@@ -211,7 +208,7 @@ uninstall: uninstall-binary uninstall-binary: - rm -f $(SBINDIR)/ejabberdctl + rm -f $(BINDIR)/ejabberdctl - rm -fr $(DOCDIR) - rm -f $(BEAMDIR)/*.beam - rm -f $(BEAMDIR)/*.app + rm -f $(BINDIR)/iex + rm -f $(BINDIR)/elixir + rm -f $(BINDIR)/mix |