[23069] in Source-Commits
/svn/athena r22732 - trunk/debathena/config/config-build-common
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Fri Feb 1 21:34:09 2008
Date: Fri, 1 Feb 2008 21:33:36 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200802020233.VAA22853@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-02-01 21:33:35 -0500 (Fri, 01 Feb 2008)
New Revision: 22732
Modified:
trunk/debathena/config/config-build-common/debathena-divert.mk
Log:
* debathena/config/config-build-common/debathena-divert.mk: Actually
make debathena-divert.mk divert everything in
DEBATHENA_REPLACE_CONFFILES (before I only had divert.sh.in added to
every package with a nonempty DEBATHENA_REPLACE_CONFFILES).
Modified: trunk/debathena/config/config-build-common/debathena-divert.mk
===================================================================
--- trunk/debathena/config/config-build-common/debathena-divert.mk 2008-02-01 23:24:06 UTC (rev 22731)
+++ trunk/debathena/config/config-build-common/debathena-divert.mk 2008-02-02 02:33:35 UTC (rev 22732)
@@ -16,28 +16,32 @@
DEBATHENA_DIVERT_ENCODER = /usr/share/debathena-config-build-common/encode
+debathena-divert/%: package = $(subst debathena-divert/,,$@)
+debathena-divert/%: replace_inputs = $(DEBATHENA_REPLACE_CONFFILES_$(package))
+debathena-divert/%: replace_files = $(foreach file,$(replace_inputs),$(call debathena_conffile_dest,$(file)))
+debathena-divert/%: divert_files = $(DEBATHENA_DIVERT_FILES) $(replace_files)
$(patsubst %,debathena-divert/%,$(DEBATHENA_DIVERT_PACKAGES)) :: debathena-divert/%:
( \
sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEBATHENA_DIVERT_SUFFIX#/$(DEBATHENA_DIVERT_SUFFIX)/g' $(DEBATHENA_DIVERT_SCRIPT); \
- $(if $(DEBATHENA_DIVERT_FILES_$(cdbs_curpkg)), \
+ $(if $($(divert_files)), \
echo 'if [ "$$1" = "configure" ]; then'; \
- $(foreach file,$(DEBATHENA_DIVERT_FILES_$(cdbs_curpkg)), \
+ $(foreach file,$($(divert_files)), \
echo " divert_link $(subst $(DEBATHENA_DIVERT_SUFFIX), ,$(file))";) \
echo 'fi'; \
) \
) >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
( \
sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEBATHENA_DIVERT_SUFFIX#/$(DEBATHENA_DIVERT_SUFFIX)/g' $(DEBATHENA_DIVERT_SCRIPT); \
- $(if $(DEBATHENA_DIVERT_FILES_$(cdbs_curpkg)), \
+ $(if $($(divert_files)), \
echo 'if [ "$$1" = "remove" ]; then'; \
- $(foreach file,$(DEBATHENA_DIVERT_FILES_$(cdbs_curpkg)), \
+ $(foreach file,$($(divert_files)), \
echo " undivert_unlink $(subst $(DEBATHENA_DIVERT_SUFFIX), ,$(file))";) \
echo 'fi'; \
) \
) >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
( \
echo -n "divert:Diverted="; \
- $(foreach file,$(DEBATHENA_DIVERT_FILES_$(cdbs_curpkg)),\
+ $(foreach file,$($(divert_files)),\
${DEBATHENA_DIVERT_ENCODER} "$(subst $(DEBATHENA_DIVERT_SUFFIX),,$(file))"; \
echo -n ", ";) \
echo \
