diff options
| -rwxr-xr-x | bin/bbackupd/bbackupd-config.in | 2 | ||||
| -rwxr-xr-x | bin/bbstored/bbstored-config.in | 2 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in index ee6a745d..925dcc3e 100755 --- a/bin/bbackupd/bbackupd-config.in +++ b/bin/bbackupd/bbackupd-config.in @@ -26,7 +26,7 @@ Parameters: 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 diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in index 57fa50c6..5ad96d50 100755 --- a/bin/bbstored/bbstored-config.in +++ b/bin/bbstored/bbstored-config.in @@ -196,7 +196,7 @@ TimeBetweenHousekeeping = 900 Server { - PidFile = @localstatedir_expanded@/bbstored.pid + PidFile = @localstatedir_expanded@/run/bbstored.pid User = $username ListenAddresses = inet:$server CertificateFile = $certificate diff --git a/configure.ac b/configure.ac index 00c0317c..f8390ec9 100644 --- a/configure.ac +++ b/configure.ac @@ -6,10 +6,6 @@ AC_INIT([Box Backup], 0.11, [boxbackup@fluffy.co.uk]) 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 @@ if test "x$enable_static_bin" = "xyes"; then 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 |