]> granicus.if.org Git - pdns/commitdiff
dnsdist: use SYSCONFDIR to retrieve config
authorPieter Lexis <pieter.lexis@powerdns.com>
Thu, 16 Apr 2015 07:45:38 +0000 (09:45 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Wed, 22 Apr 2015 13:42:57 +0000 (15:42 +0200)
pdns/dnsdist.cc
pdns/dnsdistdist/Makefile.am

index 8c20d8481c1d0c4591e1d350b728eb1a1ad4a819..28eba180554bce51be057ca7e8a9049349564af9 100644 (file)
@@ -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'},
index f3f0a4ea50d59037de25221cb2e4c4595f7694bd..c9d2ef7d0a951c990b4618e04f237a7ea9f5a055 100644 (file)
@@ -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