r11517 - packages/trunk/fenix-plugins/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-26 14:07:12 +0000 (Fri, 26 Nov 2010)
New Revision: 11517

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


Modified: packages/trunk/fenix-plugins/debian/changelog
===================================================================
--- packages/trunk/fenix-plugins/debian/changelog	2010-11-26 14:04:17 UTC (rev 11516)
+++ packages/trunk/fenix-plugins/debian/changelog	2010-11-26 14:07:12 UTC (rev 11517)
@@ -27,7 +27,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.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 16:09:06 +0200
 

Modified: packages/trunk/fenix-plugins/debian/rules
===================================================================
--- packages/trunk/fenix-plugins/debian/rules	2010-11-26 14:04:17 UTC (rev 11516)
+++ packages/trunk/fenix-plugins/debian/rules	2010-11-26 14:07:12 UTC (rev 11517)
@@ -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 @@
 		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)