[23097] in Source-Commits
/svn/athena r22760 - trunk/debathena/config/config-build-common
daemon@ATHENA.MIT.EDU (andersk@MIT.EDU)
Mon Feb 18 03:16:48 2008
Date: Mon, 18 Feb 2008 03:16:15 -0500 (EST)
From: andersk@MIT.EDU
Message-Id: <200802180816.DAA02997@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2008-02-18 03:16:15 -0500 (Mon, 18 Feb 2008)
New Revision: 22760
Modified:
trunk/debathena/config/config-build-common/debathena-check-conffiles.mk
trunk/debathena/config/config-build-common/debathena-debconf-hack.mk
trunk/debathena/config/config-build-common/debathena-divert.mk
trunk/debathena/config/config-build-common/debathena-replace-conffiles.mk
Log:
Guard against multiple inclusions.
Modified: trunk/debathena/config/config-build-common/debathena-check-conffiles.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-check-conffiles.mk 2008-02-18 04:34:04 UTC (rev 22759)
+++ trunk/debathena/config/config-build-common/debathena-check-conffiles.mk 2008-02-18 08:16:15 UTC (rev 22760)
@@ -1,5 +1,8 @@
# -*- mode: makefile; coding: utf-8 -*-
+ifndef _cdbs_rules_debathena_check_conffiles
+_cdbs_rules_debathena_check_conffiles = 1
+
ifneq ($(DEBATHENA_CHECK_CONFFILES),)
# Deprecated interface.
@@ -58,3 +61,5 @@
rm -rf $(DEBATHENA_CHECK_CONFFILES_DIR)
endif
+
+endif
Modified: trunk/debathena/config/config-build-common/debathena-debconf-hack.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-debconf-hack.mk 2008-02-18 04:34:04 UTC (rev 22759)
+++ trunk/debathena/config/config-build-common/debathena-debconf-hack.mk 2008-02-18 08:16:15 UTC (rev 22760)
@@ -1,5 +1,8 @@
# -*- mode: makefile; coding: utf-8 -*-
+ifndef _cdbs_rules_debathena_debconf_hack
+_cdbs_rules_debathena_debconf_hack = 1
+
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debathena-config-build-common (>= 3.2~)
DEBATHENA_DEBCONF_HACK_SCRIPT = /usr/share/debathena-config-build-common/debconf-hack.sh
@@ -33,3 +36,5 @@
) >> $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper
$(patsubst %,binary-fixup/%,$(DEBATHENA_DEBCONF_HACK_PACKAGES)) :: binary-fixup/%: debathena-debconf-hack/%
+
+endif
Modified: trunk/debathena/config/config-build-common/debathena-divert.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-divert.mk 2008-02-18 04:34:04 UTC (rev 22759)
+++ trunk/debathena/config/config-build-common/debathena-divert.mk 2008-02-18 08:16:15 UTC (rev 22760)
@@ -1,5 +1,8 @@
# -*- mode: makefile; coding: utf-8 -*-
+ifndef _cdbs_rules_debathena_divert
+_cdbs_rules_debathena_divert = 1
+
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debathena-config-build-common (>= 3.7~)
DEBATHENA_DIVERT_SCRIPT = /usr/share/debathena-config-build-common/divert.sh.in
@@ -41,10 +44,12 @@
) >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
( \
echo -n "divert:Diverted="; \
- $(foreach file,$(divert_files),\
- ${DEBATHENA_DIVERT_ENCODER} "$(subst $(DEBATHENA_DIVERT_SUFFIX),,$(file))"; \
+ $(foreach file,$(divert_files), \
+ $(DEBATHENA_DIVERT_ENCODER) "$(subst $(DEBATHENA_DIVERT_SUFFIX),,$(file))"; \
echo -n ", ";) \
echo \
) >> $(CURDIR)/debian/$(cdbs_curpkg).substvars
$(patsubst %,binary-fixup/%,$(DEBATHENA_DIVERT_PACKAGES)) :: binary-fixup/%: debathena-divert/%
+
+endif
Modified: trunk/debathena/config/config-build-common/debathena-replace-conffiles.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-replace-conffiles.mk 2008-02-18 04:34:04 UTC (rev 22759)
+++ trunk/debathena/config/config-build-common/debathena-replace-conffiles.mk 2008-02-18 08:16:15 UTC (rev 22760)
@@ -1,10 +1,13 @@
# -*- mode: makefile; coding: utf-8 -*-
+ifndef _cdbs_rules_debathena_replace_conffiles
+_cdbs_rules_debathena_replace_conffiles = 1
+
include /usr/share/cdbs/1/rules/debathena-check-conffiles.mk
DEBATHENA_REPLACE_CONFFILES = $(foreach package,$(DEB_ALL_PACKAGES),$(DEBATHENA_REPLACE_CONFFILES_$(package)))
-DEBATHENA_REPLACE_CONFFILES_DIR=debian/replace_file_copies
+DEBATHENA_REPLACE_CONFFILES_DIR = debian/replace_file_copies
debathena_replace_conffiles = $(patsubst %,$(DEBATHENA_REPLACE_CONFFILES_DIR)%,$(1))
undebathena_replace_conffiles = $(patsubst $(DEBATHENA_REPLACE_CONFFILES_DIR)%,%,$(1))
@@ -27,3 +30,4 @@
$(foreach file,$(DEBATHENA_REPLACE_CONFFILES),rm -f debian/$(notdir $(file)))
rm -rf $(DEBATHENA_REPLACE_CONFFILES_DIR)
+endif
