From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 3 Dec 2012 21:01:51 +0000 (+0000)
Subject: fix recursor building
X-Git-Tag: auth-3.2-rc2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91b9077d3e45a1b9cc378d0dc140739e39c9c31f;p=pdns

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 b959ef4fd..6d87cdd40 100644
--- 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 cf068f166..ba31ec78b 100755
--- 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