[fenix-plugins] 49/60: 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-plugins.

commit 65a7ff6fb02981005a7265d420d91351e7361200
Author: Peter Pentchev <roam at ringlet.net>
Date:   Fri Feb 26 23:44:19 2010 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 95f2875..f3753a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,8 @@ fenix-plugins (0.0.20070803-4) 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.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 16:09:06 +0200
 
diff --git a/debian/rules b/debian/rules
index aeb48b8..7fa0bfb 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
 
@@ -22,7 +24,7 @@ override_dh_auto_build:
 		fi \
 	done
 	dh_auto_build -- \
-		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
 		CONFFLAGS="--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)" \
 		$(PLUGINS)
 

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