From 592b4c870acb0ad7d0e29a2077ed67d0b2c2a73f Mon Sep 17 00:00:00 2001
From: corvid <corvid@lavabit.com>
Date: Sun, 7 Jun 2009 01:55:13 +0000
Subject: group dillo system config files into a dillo subdir; have Paths use
 it

---
 configure.in    | 1 +
 src/Makefile.am | 2 +-
 src/paths.cc    | 2 +-
 src/paths.hh    | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 17baa14b..c2dc919f 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,7 @@ AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(dillo, 2.0)
 AM_CONFIG_HEADER(config.h)
+sysconfdir=${sysconfdir}/${PACKAGE}
 
 dnl Options
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 84af3202..e0029f6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @LIBJPEG_CPPFLAGS@
+AM_CPPFLAGS=-DDILLO_SYSCONF='"$(sysconfdir)/"' @LIBJPEG_CPPFLAGS@
 AM_CFLAGS = @LIBPNG_CFLAGS@
 AM_CXXFLAGS = -I.. @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
 
diff --git a/src/paths.cc b/src/paths.cc
index 06d33ae5..8c5bd20a 100644
--- a/src/paths.cc
+++ b/src/paths.cc
@@ -80,7 +80,7 @@ FILE *Paths::getPrefsFP(const char *rcFile)
    if (!(fp = fopen(path, "r"))) {
       MSG("paths: Cannot open file '%s'\n", path);
 
-      char *path2 = dStrconcat(PATHS_RC_SYS, rcFile, NULL);
+      char *path2 = dStrconcat(DILLO_SYSCONF, rcFile, NULL);
       if (!(fp = fopen(path2, "r"))) {
          MSG("paths: Cannot open file '%s'\n",path2);
          MSG("paths: Using internal defaults...\n");
diff --git a/src/paths.hh b/src/paths.hh
index 111a269c..a9efc62b 100644
--- a/src/paths.hh
+++ b/src/paths.hh
@@ -14,7 +14,6 @@
 
 #define PATHS_RC_PREFS  "dillorc"
 #define PATHS_RC_KEYS   "keysrc"
-#define PATHS_RC_SYS    "/etc/dillo/"
 
 class Paths {
 public:
-- 
cgit v1.2.3