Work around the unsetting of CFLAGS in src/Makefile.am, by passing CFLAGS to make...

diff --git a/debian/changelog b/debian/changelog
index ef0583c..ffad141 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ libxcb (0.9-3) experimental; urgency=low
   * Stop setting DEB_CONFIGURE_EXTRA_FLAGS = --with-opt in debian/rules;
     cdbs does the right thing on its own, and correctly handles
     DEB_BUILD_OPTS.
+  * Work around the unsetting of CFLAGS in src/Makefile.am, by passing CFLAGS
+    to make via DEB_MAKE_INVOKE in debian/rules.
   * Remove Bugs field in control, so bugs go to the Debian BTS.
   * Set distribution to experimental.
 

diff --git a/debian/rules b/debian/rules
index 15d097a..931c6d9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_MAKE_CHECK_TARGET=check
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR) CFLAGS="$(CFLAGS)"
 
 debian/copyright: debian/copyright.debian COPYING
        cat $+ > $@