[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.4.11-8-g8b49f8a

Modestas Vainius modax-guest at alioth.debian.org
Thu Aug 27 09:05:21 UTC 2009


The following commit has been merged in the master branch:
commit f1c78afcf402297f814ea7b214ba74bcb943fa07
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Aug 27 08:40:57 2009 +0300

    Split off KDE 4 cmake flags into a text file 'kde4_flags'.
    
    As a result, they are easily parsable by make or any other tool. Rewrite
    variables.mk to load DEB_CMAKE_KDE4_FLAGS from the new text file. Flags in
    kde4_flags are still subject to be parsed by shell first therefore all shell
    escaping rules still apply.
---
 debian/changelog         |    3 ++-
 makefiles/1/kde4_flags   |   11 +++++++++++
 makefiles/1/variables.mk |   23 ++++++++---------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bae7443..020e663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 pkg-kde-tools (0.4.12~pre1) UNRELEASED; urgency=low
 
+  * Split off KDE 4 cmake flags from variables.mk to the text file.
 
- -- Modestas Vainius <modestas at vainius.eu>  Thu, 27 Aug 2009 09:41:13 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Thu, 27 Aug 2009 09:44:38 +0300
 
 pkg-kde-tools (0.4.11) unstable; urgency=low
 
diff --git a/makefiles/1/kde4_flags b/makefiles/1/kde4_flags
new file mode 100644
index 0000000..6f34242
--- /dev/null
+++ b/makefiles/1/kde4_flags
@@ -0,0 +1,11 @@
+-DCMAKE_BUILD_TYPE=Debian
+-DKDE4_BUILD_TESTS=false
+-DKDE_DISTRIBUTION_TEXT="Debian packages"
+-DCMAKE_SKIP_RPATH=true
+-DKDE4_USE_ALWAYS_FULL_RPATH=false
+-DCONFIG_INSTALL_DIR=/usr/share/kde4/config
+-DDATA_INSTALL_DIR=/usr/share/kde4/apps
+-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML
+-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg
+-DLIB_INSTALL_DIR=/usr/lib
+-DSYSCONF_INSTALL_DIR=/etc
diff --git a/makefiles/1/variables.mk b/makefiles/1/variables.mk
index ea5cf02..de75430 100644
--- a/makefiles/1/variables.mk
+++ b/makefiles/1/variables.mk
@@ -1,19 +1,12 @@
-# KDE 4 global configuration file installation directory
-DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config
-
 # Standard Debian KDE 4 cmake flags
-DEB_CMAKE_KDE4_FLAGS += \
-        -DCMAKE_BUILD_TYPE=Debian \
-        -DKDE4_BUILD_TESTS=false \
-        -DKDE_DISTRIBUTION_TEXT="Debian packages" \
-        -DCMAKE_SKIP_RPATH=true \
-        -DKDE4_USE_ALWAYS_FULL_RPATH=false \
-        -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
-        -DDATA_INSTALL_DIR=/usr/share/kde4/apps \
-        -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
-        -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
-        -DLIB_INSTALL_DIR=/usr/lib \
-        -DSYSCONF_INSTALL_DIR=/etc
+_kde4_flags := $(shell cat $(dir $(lastword $(MAKEFILE_LIST)))/kde4_flags)
+DEB_CMAKE_KDE4_FLAGS += $(_kde4_flags)
+
+# Custom KDE 4 global configuration file installation directory
+ifdef DEB_CONFIG_INSTALL_DIR
+    DEB_CMAKE_KDE4_FLAGS := $(filter-out -DCONFIG_INSTALL_DIR=%,$(DEB_CMAKE_KDE4_FLAGS)) \
+                            -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR)
+endif
 
 # Set the DEB_KDE_LINK_WITH_AS_NEEDED to yes to enable linking
 # with --as-needed (off by default)

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list