From d76ca7c65b1dd76e49a55dae5553c4b95b3ca9bc Mon Sep 17 00:00:00 2001 From: Badlop Date: Sun, 13 Jul 2008 23:32:54 +0000 Subject: [PATCH] * src/Makefile.in: Fix docdir so it recognizes prefix. If sbin dir does not exist, create it. Fix cookiefile permission check. (EJAB-696) SVN Revision: 1442 --- ChangeLog | 6 ++++++ src/Makefile.in | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f7b3b7b1..d28a8dd1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-14 Badlop + + * src/Makefile.in: Fix docdir so it recognizes prefix. If sbin dir + does not exist, create it. Fix cookiefile permission + check. (EJAB-696) + 2008-07-13 Badlop * src/configure.ac: Update installation permissions (EJAB-402) diff --git a/src/Makefile.in b/src/Makefile.in index 302294b86..cef4707bb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -71,7 +71,7 @@ EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -DATAROOTDIR = @datarootdir@ +datarootdir = @datarootdir@ DOCDIR = @docdir@ # /usr/lib/ejabberd/ebin/ @@ -164,6 +164,7 @@ install: all install -b -m 644 -g @INSTALLUSER@ inetrc $(ETCDIR)/inetrc # # Administration script + [ -d $(SBINDIR) ] || install -d 750 $(SBINDIR) install -m 550 -g @INSTALLUSER@ ejabberdctl.example $(SBINDIR)/ejabberdctl # # Binary Erlang files @@ -192,7 +193,7 @@ install: all install -d -m 750 -o @INSTALLUSER@ $(SPOOLDIR) chown -R @INSTALLUSER@ $(SPOOLDIR) chmod -R 750 $(SPOOLDIR) - [ ! -f $(COOKIEFILE) ] || chown -o @INSTALLUSER@ $(COOKIEFILE) ; chmod 400 $(COOKIEFILE) + [ ! -f $(COOKIEFILE) ] || { chown @INSTALLUSER@ $(COOKIEFILE) ; chmod 400 $(COOKIEFILE) ; } # # Log directory install -d -m 750 -o @INSTALLUSER@ $(LOGDIR)