[mapnik] 01/02: Do not append CPPFLAGS to CUSTOM_DEFINES (Closes: #791482)

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository mapnik.

commit f4da02ecdd7cd57265a856568d3bc2df258bff66
Author: Jérémy Lal <kapouer at melix.org>
Date:   Mon Jul 6 23:55:53 2015 +0200

    Do not append CPPFLAGS to CUSTOM_DEFINES (Closes: #791482)
---
 debian/rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9183b54..13c2e2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,9 @@ SCONS_FLAGS += XMLPARSER=libxml2
 SCONS_FLAGS += DEMO=False
 SCONS_FLAGS += CPP_TESTS=False
 SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/3.0
-SCONS_FLAGS += CUSTOM_CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS) -g0"
-SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -g0"
+SCONS_FLAGS += CUSTOM_CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0"
+SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0"
 SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0"
-SCONS_FLAGS += CUSTOM_DEFINES="$(shell dpkg-buildflags --get CPPFLAGS) -g0"
 
 override_dh_auto_configure: debian/stamps/configure-python
 debian/stamps/configure-python:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git