Fix CDBS 0.4.77’s incorrect splitting of multiword $(CC).

See http://bugs.debian.org/576967 .

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 4ef61cb338ab4ffb3b4e8eaa53f9f57a31414b0c..630148d5aec3c3edc72fe832835b565070fe3fb4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ libnss-nonlocal (1.11-0debathena1) UNRELEASED; urgency=low
       users
   * Update build flags for biarch packages (fixes lib32nss-nonlocal path
     on squeeze).
+  * Fix FTBFS on squeeze due to CDBS’s buggy splitting of multiword
+    $(CC) (Debian bug #576967).
   * Bump Standards-Version to 3.8.4 (no changes required).
 
  -- Anders Kaseorg <andersk@mit.edu>  Thu, 29 Apr 2010 00:12:44 -0400

diff --git a/debian/rules b/debian/rules
index c92070ce365f715ff2fadcd5b9a15ccd6916d323..e0d25f323e99ffb58fb53ad1a55b417329c50b1e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,10 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.9
 DEB_AUTO_UPDATE_ACLOCAL = 1.9
 DEB_AUTO_UPDATE_LIBTOOL = pre
 
+# Fix http://bugs.debian.org/576967 : CDBS 0.4.77 in squeeze
+# incorrectly splits multiword $(CC) and $(CXX).
+override cdbs_set_nondefaultvars = $(foreach var,$1,$(if $(filter-out $(origin $(var)),default),$(var)='$($(var))'))
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk