r11518 - packages/trunk/fenix/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-26 14:08:41 +0000 (Fri, 26 Nov 2010)
New Revision: 11518

Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/rules
Log:
Oops, get CPPFLAGS, too, from dpkg-buildflags :)


Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2010-11-26 14:07:12 UTC (rev 11517)
+++ packages/trunk/fenix/debian/changelog	2010-11-26 14:08:41 UTC (rev 11518)
@@ -20,7 +20,8 @@
     - 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

Modified: packages/trunk/fenix/debian/rules
===================================================================
--- packages/trunk/fenix/debian/rules	2010-11-26 14:07:12 UTC (rev 11517)
+++ packages/trunk/fenix/debian/rules	2010-11-26 14:08:41 UTC (rev 11518)
@@ -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 @@
 		--enable-fpg \
 		--enable-dependency-tracking \
 		CFLAGS="$(CFLAGS)" \
+		CPPFLAGS="$(CPPFLAGS)" \
 		LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_build: