add semistaticg++ wrapper to dist; make semistatic default for static deb build

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

diff --git a/Makefile.am b/Makefile.am
index ef8b525c7ccbc4913090130fdee4ee7ee4509d98..48c91dc647ae8a08f32351c2189bc3e2b5de74aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS=modules codedocs @programdescend@
 DIST_SUBDIRS=modules codedocs pdns
 EXTRA_DIST=TODO README HACKING INSTALL ChangeLog debian-pdns/* pdns.spec  \
 codedocs/Makefile codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
-contrib/systemd-pdns.service bootstrap
+contrib/systemd-pdns.service bootstrap build-scripts/semistaticg++
 
 ACLOCAL_AMFLAGS = -I.
 

diff --git a/debian-pdns/rules b/debian-pdns/rules
index 9a0d48e84522d5a4d4e4da0002019783cafda97e..ff1d26ebaa9b4a10474cc6259db12ca4ee6f30a7 100755 (executable)
--- a/debian-pdns/rules
+++ b/debian-pdns/rules
@@ -43,7 +43,8 @@ binary-doc:
 
 build-static stamp-build-static:
                ./configure \
-               CC="ccache gcc" CPPFLAGS=-I/usr/local/include/botan-1.10 CXX="ccache g++"\
+               CXX=$(shell pwd)/build-scripts/semistaticg++ \
+               CC="ccache gcc" CPPFLAGS=-I/usr/local/include/botan-1.10 \
                --prefix=/usr \
                --libexecdir='$${prefix}/lib' \
                --libdir='$${prefix}/lib/powerdns' \