Fix bug where DEB_DIVERT code gets added twice if a package uses both DEB_DIVERT_FILE...

[config-package-dev.git] / divert.mk

diff --git a/divert.mk b/divert.mk
index 229f99903954f2ddc08bb7d205b0281b88c6f795..30fb02e072a92d4d717812d5058fe5f06712e680 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -25,10 +25,8 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev
 DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
 
 DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
-    $(if $(DEB_DIVERT_FILES_$(package)),$(package)))
-
-DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
-    $(if $(DEB_REPLACE_FILES_$(package)),$(package)))
+    $(if $(DEB_REPLACE_FILES_$(package)),$(package), \
+    $(if $(DEB_DIVERT_FILES_$(package)),$(package))))
 
 ifeq ($(DEB_DIVERT_EXTENSION),)
 DEB_DIVERT_EXTENSION = .divert