[osm2pgsql] 10/11: Append CPPFLAGS to CFLAGS & CXXFLAGS to use -D_FORTIFY_SOURCE=2.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository osm2pgsql.

commit ce774ace0392264e44779a505ba856a2ce0adfef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 30 16:18:06 2014 +0200

    Append CPPFLAGS to CFLAGS & CXXFLAGS to use -D_FORTIFY_SOURCE=2.
---
 debian/changelog | 1 +
 debian/rules     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 425cf03..0c14322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ osm2pgsql (0.84.0-1) UNRELEASED; urgency=low
   * Refresh patches.
   * Drop get-orig-source target, upstream moved from OSM SVN to GitHub.
   * Add build dependency on liblua5.2-dev and lua5.2.
+  * Append CPPFLAGS to CFLAGS & CXXFLAGS to use -D_FORTIFY_SOURCE=2.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 30 Apr 2014 13:05:29 +0200
 
diff --git a/debian/rules b/debian/rules
index c0c60f9..d4a44f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
 %:
 	dh $@ \
 		--with autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+
 override_dh_compress:
 	# clean up some naive file permissions
 	dh_compress -X.php -X.sql -X.js -X.c -X.h

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