[SCM] Debian Qt/KDE packaging tools branch, dhmk, updated. debian/0.9.5-25-g3e6398a

[Modestas Vainius]

The following commit has been merged in the dhmk branch:
commit 7821182e449171f7a2f7f17e3ac9c9f928a6b530
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Mar 9 02:29:39 2011 +0200

    Protect dhmk.mk against accidental double inclusion.
---
 qt-kde-team/2/dhmk.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index 01f77e0..f6a97ab 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -13,8 +13,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-dhmk_top_makefile := $(firstword $(MAKEFILE_LIST))
+ifndef dhmk_this_makefile
+
 dhmk_this_makefile := $(lastword $(MAKEFILE_LIST))
+dhmk_top_makefile := $(firstword $(MAKEFILE_LIST))
 dhmk_stamped_targets = configure build-indep build-arch build
 dhmk_dynamic_targets = install-indep install-arch install binary-indep binary-arch binary clean
 dhmk_standard_targets = $(dhmk_stamped_targets) $(dhmk_dynamic_targets)
@@ -97,3 +99,4 @@ $(foreach t,$(dhmk_standard_targets),dhmk_run_$(t)_commands): dhmk_run_%_command
 
 endif # ifeq (dhmk_override_info_mode,yes)
 
+endif # ifndef dhmk_this_makefile

-- 
Debian Qt/KDE packaging tools