Allow overriding of SYSCONFDIR, LOCALSTATEDIR from recursor Makefile

Fixes #734.

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index 8ee769d2a36af02015db3dd7ad18b0e5dde3b9e3..1a04dc6b5a6f53d8c5b4d2a9e6cca1c62cc68ef5 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -1,7 +1,8 @@
 # user editable stuff:
 SBINDIR=/usr/sbin/
 BINDIR=/usr/bin/
-CONFIGDIR="/etc/powerdns/"
+SYSCONFDIR=/etc/powerdns/
+LOCALSTATEDIR=/var/run/
 OPTFLAGS?=-O3
 CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
 CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
@@ -53,6 +54,9 @@ endif
 
 LDFLAGS += $(PROFILEFLAGS) $(STATICFLAGS)
 
+CXXFLAGS += -DSYSCONFDIR='"$(SYSCONFDIR)"' -DLOCALSTATEDIR='"$(LOCALSTATEDIR)"'
+CFLAGS += -DSYSCONFDIR='"$(SYSCONFDIR)"' -DLOCALSTATEDIR='"$(LOCALSTATEDIR)"'
+
 # Version
 build_date=$(shell LC_TIME=C date '+%Y%m%d%H%M%S')
 build_host=$(shell id -u -n)@$(shell hostname -f)

diff --git a/pdns/config-recursor.h b/pdns/config-recursor.h
index 491b46c653155e14b6ea1ddeb2a0633fbc36984d..0e713a35b6c7687c99a569ce7a2c9ddf6202d207 100644 (file)
--- a/pdns/config-recursor.h
+++ b/pdns/config-recursor.h
@@ -1,3 +1 @@
-#define SYSCONFDIR "/etc/powerdns/" 
-#define LOCALSTATEDIR "/var/run/" 
 #define RECURSOR