X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/c94f42bb7158c49a7b9fad53da5d761f55aa4fb7..refs/heads/master:/divert.mk diff --git a/divert.mk b/divert.mk index d352554..9ad61ca 100644 --- a/divert.mk +++ b/divert.mk @@ -21,7 +21,9 @@ # config-package.mk. # divert.mk handles the low-level diversion logic. It includes -# divert.sh.in in the postinst and prerm scripts, and adds +# divert.sh.in in the postinst and prerm scripts, and adds calls to the +# functions in divert.sh.in to add and remove diversions and symlinks at +# the appropriate points. ifndef _cdbs_rules_divert _cdbs_rules_divert = 1 @@ -99,7 +101,7 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%: fi;) \ sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \ $(if $(divert_files_thispkg), \ - echo 'if [ "$$1" = "remove" ]; then'; \ + echo 'if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ]; then'; \ $(foreach file,$(call reverse_dh_compat_6,$(divert_files)), \ echo " undivert_unlink $(call divert_files_replace_name,$(file), )";) \ $(foreach file,$(call reverse_dh_compat_6,$(divert_remove_files)), \