[fenix] 97/127: Oops, get CPPFLAGS, too, from dpkg-buildflags :)

[Peter Pentchev]

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

roam-guest pushed a commit to branch master
in repository fenix.

commit df5fde63642ccd6d2f9839e508357c75e3d119ef
Author: Peter Pentchev <roam at ringlet.net>
Date:   Fri Nov 26 14:08:41 2010 +0000

    Oops, get CPPFLAGS, too, from dpkg-buildflags :)
---
 debian/changelog | 3 ++-
 debian/rules     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 74be568..11356f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,8 @@ fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low
     - shorten the rules file using the dh(1) helper
     - use "dh --with autotools_dev" to handle config.guess and config.sub
     - use debhelper override rules
-  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS and LDFLAGS.
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS, CPPFLAGS
+    and LDFLAGS.
   * With this dpkg-dev dependency, this upload by itself Closes: #604964.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 13:25:18 +0200
diff --git a/debian/rules b/debian/rules
index 8cec7fa..e1e3eb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+
 CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
 CFLAGS += -Wall -fno-strict-aliasing
 CFLAGS += -DUSE_GETTEXT
@@ -19,6 +21,7 @@ override_dh_auto_configure:
 		--enable-fpg \
 		--enable-dependency-tracking \
 		CFLAGS="$(CFLAGS)" \
+		CPPFLAGS="$(CPPFLAGS)" \
 		LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_build:

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