summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2006-04-29 17:02:43 -0700
committerJosh Triplett <josh@freedesktop.org>2006-04-29 17:02:43 -0700
commit4a891c6f4e49a04866b2cac7bf8bb679a256d3b4 (patch)
tree3a627f1f5407a4785112d278a2088c4665fff400 /debian
parent140c30e522c664f0675b63301bea22e4062cd155 (diff)
Work around the unsetting of CFLAGS in src/Makefile.am, by passing CFLAGS to make via DEB_MAKE_INVOKE in debian/rules.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ef0583c..ffad141 100644
--- 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
--- 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 $+ > $@