casa-mp-base

diff --git a/Misc/Portable.h b/Misc/Portable.h

index 12cae0a..d1721dd 100644

--- a/Misc/Portable.h

+++ b/Misc/Portable.h

@@ -166,22 +166,22 @@ struct link_state_notify_t

 #endif

 #if defined(LINUX) || defined(BSD) || defined(SUNOS)

-#define WORKDIR            "/var/lib/dibbler"

+#define WORKDIR            "__PREFIX__/var/lib/dibbler"

 #define DEFAULT_SCRIPT     ""

-#define CLNTCONF_FILE      "/etc/dibbler/client.conf"

-#define SRVCONF_FILE       "/etc/dibbler/server.conf"

-#define RELCONF_FILE       "/etc/dibbler/relay.conf"

+#define CLNTCONF_FILE      "__PREFIX__/etc/dibbler/client.conf"

+#define SRVCONF_FILE       "__PREFIX__/etc/dibbler/server.conf"

+#define RELCONF_FILE       "__PREFIX__/etc/dibbler/relay.conf"

 #define RESOLVCONF_FILE    "/etc/resolv.conf"

 #define NTPCONF_FILE       "/etc/ntp.conf"

-#define RADVD_FILE         "/etc/dibbler/radvd.conf"

-#define CLNTPID_FILE       "/var/lib/dibbler/client.pid"

-#define SRVPID_FILE        "/var/lib/dibbler/server.pid"

-#define RELPID_FILE        "/var/lib/dibbler/relay.pid"

-#define CLNTLOG_FILE       "/var/log/dibbler/dibbler-client.log"

-#define SRVLOG_FILE        "/var/log/dibbler/dibbler-server.log"

-#define RELLOG_FILE        "/var/log/dibbler/dibbler-relay.log"

-#define CLNT_AAASPI_FILE   "/var/lib/dibbler/AAA/AAA-SPI"

-#define SRV_KEYMAP_FILE    "/var/lib/dibbler/AAA/keys-mapping"

+#define RADVD_FILE         "__PREFIX__/etc/dibbler/radvd.conf"

+#define CLNTPID_FILE       "__PREFIX__/var/lib/dibbler/client.pid"

+#define SRVPID_FILE        "__PREFIX__/var/lib/dibbler/server.pid"

+#define RELPID_FILE        "__PREFIX__/var/lib/dibbler/relay.pid"

+#define CLNTLOG_FILE       "__PREFIX__/var/log/dibbler/dibbler-client.log"

+#define SRVLOG_FILE        "__PREFIX__/var/log/dibbler/dibbler-server.log"

+#define RELLOG_FILE        "__PREFIX__/var/log/dibbler/dibbler-relay.log"

+#define CLNT_AAASPI_FILE   "__PREFIX__/var/lib/dibbler/AAA/AAA-SPI"

+#define SRV_KEYMAP_FILE    "__PREFIX__/var/lib/dibbler/AAA/keys-mapping"

 #define NULLFILE           "/dev/null"

 /* those defines were initially used on Linux only, but hopefully 

diff --git a/Port-bsd/lowlevel-bsd.c b/Port-bsd/lowlevel-bsd.c

index ede2626..04056a1 100644

--- a/Port-bsd/lowlevel-bsd.c

+++ b/Port-bsd/lowlevel-bsd.c

@@ -488,10 +488,10 @@ int is_addr_tentative(char * ifacename, int iface, char * addr) {

 char * getAAAKeyFilename(uint32_t SPI) {

     static char filename[1024];

     if (SPI != 0)

-        snprintf(filename, 1024, "%s%s%x", "/var/lib/dibbler/AAA/", "AAA-key-",

+        snprintf(filename, 1024, "%s%s%x", WORKDIR "/AAA/", "AAA-key-",

             SPI);

     else

-        strcpy(filename, "/var/lib/dibbler/AAA/AAA-key");

+        strcpy(filename, WORKDIR "/AAA/AAA-key");

     return filename;

 }

diff --git a/doc/examples/client.conf b/doc/examples/client.conf

index 86370d9..d54445a 100644

--- a/doc/examples/client.conf

+++ b/doc/examples/client.conf

@@ -21,7 +21,7 @@ log-mode short

 log-level 7