[Box Backup-commit] COMMIT r2113 - in box/trunk: . bin/bbackupd bin/bbstored

[boxbackup-dev at fluffy.co.uk]

Author: jamesog
Date: 2008-03-25 22:29:24 +0000 (Tue, 25 Mar 2008)
New Revision: 2113

Modified:
   box/trunk/bin/bbackupd/bbackupd-config.in
   box/trunk/bin/bbstored/bbstored-config.in
   box/trunk/configure.ac
Log:
Correct sysconfdir and localstatedir as they weren't doing what they were supposed to.


Modified: box/trunk/bin/bbackupd/bbackupd-config.in
===================================================================
--- box/trunk/bin/bbackupd/bbackupd-config.in	2008-03-19 07:06:40 UTC (rev 2112)
+++ box/trunk/bin/bbackupd/bbackupd-config.in	2008-03-25 22:29:24 UTC (rev 2113)
@@ -26,7 +26,7 @@
                         explicitly, using bbackupctl sync
     account-num (hexdecimal) and server-hostname
                         are supplied by the server administrator
-    working-dir         is usually @localstatedir_expanded@
+    working-dir         is usually @localstatedir_expanded@/bbackupd
     backup directories  is list of directories to back up
 
 __E

Modified: box/trunk/bin/bbstored/bbstored-config.in
===================================================================
--- box/trunk/bin/bbstored/bbstored-config.in	2008-03-19 07:06:40 UTC (rev 2112)
+++ box/trunk/bin/bbstored/bbstored-config.in	2008-03-25 22:29:24 UTC (rev 2113)
@@ -196,7 +196,7 @@
 
 Server
 {
-	PidFile = @localstatedir_expanded@/bbstored.pid
+	PidFile = @localstatedir_expanded@/run/bbstored.pid
 	User = $username
 	ListenAddresses = inet:$server
 	CertificateFile = $certificate

Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2008-03-19 07:06:40 UTC (rev 2112)
+++ box/trunk/configure.ac	2008-03-25 22:29:24 UTC (rev 2113)
@@ -6,10 +6,6 @@
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
 
-# override default sysconfdir, for backwards compatibility
-test "$sysconfdir" = NONE && sysconfdir=/etc
-test "$localstatedir" = NONE && localstatedir=/var/run
-
 touch install-sh
 AC_CANONICAL_SYSTEM
 test -s install-sh || rm install-sh
@@ -273,6 +269,10 @@
   LIBS="-Wl,-Bstatic $LIBS -Wl,-Bdynamic"
 fi
 
+# override default sysconfdir, for backwards compatibility
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+test "$localstatedir" = '${prefix}/var' && localstatedir=/var
+
 ## Kludge to allow makeparcels.pl to use bindir. This is not a good long term
 ## solution because it prevents use of "make exec_prefix=/some/dir"
 saved_prefix=$prefix