Changeset 2061

Timestamp:

28/01/2008 23:53:26 (4 years ago)

Author:

chris

Message:

Change the default sysconfdir to /etc.

Generate expanded versions of sysconfdir and localstatedir, as well as
bindir.

Expand variables in BoxPortsAndFiles?.h.in.

Changed default configuration dir in BoxPortsAndFiles?.h.in to use
@sysconfdir_expanded@/box, defaulting to /etc/box as before. But now
you can override it with something like --sysconfdir=/usr/etc
(to place config files in /usr/etc/box).

Location:

box/trunk

Files:

• configure.ac (modified) (3 diffs)
• lib/common/BoxPortsAndFiles.h.in (moved) (moved from box/trunk/lib/common/BoxPortsAndFiles.h) (1 diff)

box/trunk/configure.ac

@@ -6 +6 @@
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
+
+# override default sysconfdir, for backwards compatibility
+AC_SUBST([sysconfdir], ['/etc'])dnl
 
 touch install-sh
@@ -274 +277 @@
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-bindir_expanded=`eval "echo $bindir"`
-bindir_expanded=`eval "echo $bindir_expanded"`
+bindir_expanded=`       eval "echo $bindir"`
+bindir_expanded=`       eval "echo $bindir_expanded"`
+sysconfdir_expanded=`   eval "echo $sysconfdir"`
+localstatedir_expanded=`eval "echo $localstatedir"`
 prefix=$saved_prefix
 exec_prefix=$saved_exec_prefix
-AC_SUBST([bindir_expanded])
+AC_SUBST([bindir_expanded sysconfdir_expanded localstatedir_expanded])
 
 
@@ -294 +299 @@
                    infrastructure/makeparcels.pl
                    infrastructure/makedistribution.pl
+                   lib/common/BoxPortsAndFiles.h
                    lib/common/makeexception.pl
                    lib/raidfile/raidfile-config

box/trunk/lib/common/BoxPortsAndFiles.h.in

@@ -32 +32 @@
                 GetDefaultConfigFilePath("bbstored.conf").c_str()
 #else
-#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG        "/etc/box/bbackupd.conf"
-#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG        "/etc/box/raidfile.conf"
-#define BOX_FILE_BBSTORED_DEFAULT_CONFIG        "/etc/box/bbstored.conf"
+#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbackupd.conf"
+#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "@sysconfdir_expanded@/box/raidfile.conf"
+#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "@sysconfdir_expanded@/box/bbstored.conf"
 #endif