From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 16 Apr 2015 07:45:38 +0000 (+0200)
Subject: dnsdist: use SYSCONFDIR to retrieve config
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~88^2~10^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11058bd6e446faa742299233f1b09a31fb9dc0bc;p=thirdparty%2Fpdns.git

dnsdist: use SYSCONFDIR to retrieve config
---

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 8c20d8481c..28eba18055 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -851,7 +851,7 @@ try
     exit(EXIT_FAILURE);
   }
 #endif
-  g_cmdLine.config="/etc/dnsdist.conf";
+  g_cmdLine.config=SYSCONFDIR "/dnsdist.conf";
   struct option longopts[]={ 
     {"config", required_argument, 0, 'C'},
     {"execute", required_argument, 0, 'e'},
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index f3f0a4ea50..c9d2ef7d0a 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) -O3 -Wall -pthread 
+AM_CPPFLAGS = -I pdns $(LUA_CFLAGS) $(YAHTTP_CFLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\"
 
 SUBDIRS=pdns/ext/yahttp