[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.0

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 132570a79a6cafdd96b34140b4bf627147aad3df
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Mar 10 22:33:56 2011 +0200

    Add $(overriden_command) variable for use in overrides.
    
    This variable can be used to retrieve full original command line (including
    extra arguments added by dh addons and DHMK_OPTIONS) for the command being
    overriden.
---
 qt-kde-team/2/dhmk.mk |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index 33dc9f2..ea86374 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -37,6 +37,10 @@ set_command_options = $(foreach t,$(filter $(or $3,%),$(dhmk_standard_targets)),
 # $(call butfirstword,TEXT,DELIMITER)
 butfirstword = $(patsubst $(firstword $(subst $2, ,$1))$2%,%,$1)
 
+# Use this to retrieve full command line to the overriden command in the
+# override_% targets
+overriden_command = $($(DHMK_TARGET)_$(call butfirstword,$@,_)) $(DHMK_OPTIONS)
+
 # This makefile is not parallel compatible by design (e.g. command chains
 # below)
 .NOTPARALLEL:
@@ -80,7 +84,7 @@ $(foreach t,$(dhmk_indeparch_targets),debian/dhmk_$(t)-arch):  export DH_INTERNA
 # Create debian/dhmk_{action} targets.
 # NOTE: dhmk_run_{target}_commands are defined below
 $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%:
-	$(MAKE) -f $(dhmk_top_makefile) dhmk_run_$*_commands
+	$(MAKE) -f $(dhmk_top_makefile) dhmk_run_$*_commands DHMK_TARGET="$*"
 	$(if $(filter $*,$(dhmk_stamped_targets)),touch $@)
 	$(if $(filter clean,$*),rm -f $(dhmk_rules_mk)\
 	    $(foreach t,$(dhmk_stamped_targets),debian/dhmk_$(t)))
@@ -97,7 +101,8 @@ $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%:
 
 .SECONDEXPANSION:
 
-# Relationships (depends/prerequisites)
+# Specify relationships (depends/prerequisites) and export DHMK_TARGET
+# environment variable for each top target
 $(foreach t,$(dhmk_standard_targets),debian/dhmk_$(t)): debian/dhmk_%: $$(foreach d,$$(dhmk_%_depends),debian/dhmk_$$d)
 
 # Generate command chains for the standard targets

-- 
Debian Qt/KDE packaging tools