fix recursor building

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2960 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index b959ef4fd3150728bf0680ae592ba09b5638046d..6d87cdd40b6757b32cfcaa0f4c942ad71e0b5d9b 100644 (file)
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -3,7 +3,7 @@ SBINDIR=/usr/sbin/
 BINDIR=/usr/bin/
 CONFIGDIR="/etc/powerdns/"
 OPTFLAGS?=-O3
-CXXFLAGS:= $(CXXFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
+CXXFLAGS:= $(CXXFLAGS) -Iext/rapidjson/include -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
 CFLAGS:=$(CFLAGS) -Wall $(OPTFLAGS) $(PROFILEFLAGS) $(ARCHFLAGS) -pthread
 LDFLAGS:=$(LDFLAGS) $(ARCHFLAGS) -pthread
 

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index cf068f166c461e6d0cb1ce1770682b58a692d5d1..ba31ec78bcf2fbe3b0ee87bdc47204755c194a45 100755 (executable)
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -37,6 +37,9 @@ cp Makefile-recursor.win32 $DIRNAME/Makefile.win32
 cp README-recursor $DIRNAME/README
 cp ../COPYING $DIRNAME/
 cp config-recursor.h $DIRNAME/config.h
+mkdir -p $DIRNAME/ext/rapidjson/include/rapidjson/internal
+cp -a ext/rapidjson/include/rapidjson/*.h $DIRNAME/ext/rapidjson/include/rapidjson/
+cp -a ext/rapidjson/include/rapidjson/internal/*.h $DIRNAME/ext/rapidjson/include/rapidjson/internal
 mkdir $DIRNAME/rrd
 cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd
 cp aes/*.{c,cc,h} $DIRNAME