From: Geoffrey Thomas Date: Mon, 21 May 2012 06:49:21 +0000 (-0400) Subject: divert.mk: Fix two slightly misleading comments X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/commitdiff_plain/c94f42bb7158c49a7b9fad53da5d761f55aa4fb7 divert.mk: Fix two slightly misleading comments --- diff --git a/divert.mk b/divert.mk index 577021d..d352554 100644 --- a/divert.mk +++ b/divert.mk @@ -53,7 +53,7 @@ endif # foo.divert.divert-orig divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/') -# Transform a full path into the path it should be diverted to if it's +# Encode a full path into the path it should be diverted to if it's # removed remove_files_name = /usr/share/$(cdbs_curpkg)/$(shell $(DEB_DIVERT_ENCODER) $(1)) @@ -117,8 +117,8 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%: # and Conflicts: lists. This prevents two packages diverting the same # file from being installed simultaneously (it cannot work, and this # produces a much less ugly error). Requires in debian/control: -# Provides: $(diverted-files) -# Conflicts: $(diverted-files) +# Provides: ${diverted-files} +# Conflicts: ${diverted-files} set -e; \ { \ echo -n "diverted-files="; \