* 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

diff --git a/ChangeLog b/ChangeLog
index 9f7b3b7b1693e6db808d7d805499d9480ead5792..d28a8dd1ebffc10e9831841e28b083d07d2b856a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-14  Badlop  <badlop@process-one.net>
+
+       * 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  <badlop@process-one.net>
 
        * src/configure.ac: Update installation permissions (EJAB-402)

diff --git a/src/Makefile.in b/src/Makefile.in
index 302294b868872b59c3ab09a81cee5ce6ba9ea2a9..cef4707bb1e0df4ccdb7a38b92fe23c179d55325 100644 (file)
--- 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)