[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.15.0-2-g9d18a0d

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=9d18a0d

The following commit has been merged in the master branch:
commit 9d18a0df61e5e36d7ad7833f32eef77594b9e476
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 16 13:24:32 2012 +0200

    extend the workaround for cmake bug #653916 also to CFLAGS
---
 debian/changelog      |    2 ++
 qt-kde-team/2/dhmk.mk |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e76ca9a..2448196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 pkg-kde-tools (0.15.1~pre1) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Extend the workaround for cmake bug #653916 also to CFLAGS.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Jun 2012 13:21:40 +0200
 
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index 84452a0..8d8b265 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -73,9 +73,10 @@ $(dhmk_env_mk): $(MAKEFILE_LIST)
 include $(call dhmk_include_cmd,$(dhmk_env_mk))
 include $(call dhmk_include_cmd,$(dhmk_rules_mk))
 
-# Add CPPFLAGS to CXXFLAGS, this is a workaround for a cmake bug,
+# Add CPPFLAGS to CFLAGS/CXXFLAGS, this is a workaround for a cmake bug,
 # which ignores CPPFLAGS, see:
 #  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916
+export CFLAGS += $(CPPFLAGS)
 export CXXFLAGS += $(CPPFLAGS)
 
 # Routine used to run an override target if there is one ($1 should be

-- 
Debian Qt/KDE packaging tools