[Xcb-commit] xcb

[Josh Triplett]

 xcb/debian/changelog |    2 ++
 xcb/debian/rules     |    1 +
 2 files changed, 3 insertions(+)

New commits:
diff-tree 390a094579bda0ca78099883f6115a0ed788ff51 (from cdfcf9cef5b5f20f8a5c20e81a53a7be557d8cd5)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Apr 29 17:02:43 2006 -0700

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

diff --git a/xcb/debian/changelog b/xcb/debian/changelog
index ef0583c..ffad141 100644
--- a/xcb/debian/changelog
+++ b/xcb/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/xcb/debian/rules b/xcb/debian/rules
index 15d097a..931c6d9 100755
--- a/xcb/debian/rules
+++ b/xcb/debian/rules
@@ -28,6 +28,7 @@ include /usr/share/cdbs/1/rules/debhelpe
 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 $+ > $@