[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.4-9-gbb63eb9

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit bb63eb93ac8d95048ab1bb0514e514030b52eefa
Author: Modestas Vainius <modax at debian.org>
Date:   Sun May 27 19:55:11 2012 +0300

    Make variables.mk respect LDFLAGS from environment.
    
    Thanks to Simon Ruderich for the patch. (Closes: #669183)
---
 debian/README.Debian     |    6 +++---
 debian/changelog         |    2 ++
 makefiles/1/variables.mk |    6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 6252ae4..4680080 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -68,9 +68,9 @@ builddir/Makefile:
 	mkdir -p builddir
 	cd builddir && cmake .. \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_C_FLAGS="$(CFLAGS)" \
-		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
-		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_C_FLAGS="$(CPPFLAGS) $(CFLAGS)" \
+		-DCMAKE_LD_FLAGS="$(LDFLAGS) -Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS="$(CPPFLAGS) $(CXXFLAGS)" \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		$(DEB_CMAKE_KDE4_FLAGS)
diff --git a/debian/changelog b/debian/changelog
index c9b5f86..8305725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pkg-kde-tools (0.15.0~pre1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3: no changes needed.
   * Install pkgkde-git as an alias for pkgkde-vcs with VCS type forced to git.
   * Implement pkgkde-git clone and update-config subcommands.
+  * Make variables.mk respect LDFLAGS from environment. Thanks to Simon
+    Ruderich for the patch. (Closes: #669183)
 
  -- Modestas Vainius <modax at debian.org>  Mon, 21 May 2012 19:42:46 +0300
 
diff --git a/makefiles/1/variables.mk b/makefiles/1/variables.mk
index ab8f3c2..b0f4c75 100644
--- a/makefiles/1/variables.mk
+++ b/makefiles/1/variables.mk
@@ -47,7 +47,7 @@ endif
 
 ifneq (,$(DEB_KDE_LINKER_FLAGS))
     DEB_CMAKE_CUSTOM_FLAGS += \
-        -DCMAKE_SHARED_LINKER_FLAGS="$(DEB_KDE_LINKER_FLAGS)" \
-        -DCMAKE_MODULE_LINKER_FLAGS="$(DEB_KDE_LINKER_FLAGS)" \
-        -DCMAKE_EXE_LINKER_FLAGS="$(DEB_KDE_LINKER_FLAGS)"
+        -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS) $(DEB_KDE_LINKER_FLAGS)" \
+        -DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS) $(DEB_KDE_LINKER_FLAGS)" \
+        -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS) $(DEB_KDE_LINKER_FLAGS)"
 endif

-- 
Debian Qt/KDE packaging tools