# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2009-10-14 23:48:54
# Node ID ef8623524c7b58e3144d5a1bd7d502cf04c87e0d
# Parent  bfa4ecc86496a258430ed06ecf7d74a640ab1ccc

use substitution for default directories in confs

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,7 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9
 
 AC_DEFINE_DIR([SYSCONFDIR], [sysconfdir], [Directory to find configuration files in])
 AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Directory in which the server or client may store its state files and data])
+AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Directory where PID files are stored])
 
 AC_CONFIG_FILES([Makefile
 src/Makefile
@@ -57,6 +58,8 @@ src/server/Makefile
 src/client/Makefile
 src/tests/Makefile
 etc/Makefile
+etc/distrendaemon.conf
+etc/distrenslave.conf
 ])
 
 AC_OUTPUT
diff --git a/etc/distrendaemon.conf b/etc/distrendaemon.conf.in
rename from etc/distrendaemon.conf
rename to etc/distrendaemon.conf.in
--- a/etc/distrendaemon.conf
+++ b/etc/distrendaemon.conf.in
@@ -3,7 +3,7 @@
 */
 daemon
 {
-  datadir = "/var/lib/distren"
+  datadir = "@LOCALSTATEDIR@/@PACKAGE@"
   render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
 }
 
@@ -12,6 +12,6 @@ include("distrencommon.conf")
 
 listen {
        type = "unix"
-       path = "/var/run/distrend.sock"
+       path = "@RUNSTATEDIR@/@PACKAGE@d.sock"
        port = "0770"
 }
\ No newline at end of file
diff --git a/etc/distrenslave.conf b/etc/distrenslave.conf.in
rename from etc/distrenslave.conf
rename to etc/distrenslave.conf.in
--- a/etc/distrenslave.conf
+++ b/etc/distrenslave.conf.in
@@ -5,4 +5,4 @@ slave
 
 include("distrencommon.conf")
 
-datadir = "/var/lib/distren"
+datadir = "@LOCALSTATEDIR@/@PACKAGE@"