X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/62889cea6e056825d15f889118593124fc3f19b7..262d88c40b1113d0198c7fa686b0effcf8ba3d20:/transform-files.mk

diff --git a/transform-files.mk b/transform-files.mk
index 284a1dd..c75e861 100644
--- a/transform-files.mk
+++ b/transform-files.mk
@@ -31,15 +31,18 @@ DEB_TRANSFORM_FILES_TMPDIR=debian/transform_file_copies
 
 debian_transform_files = $(patsubst %,$(DEB_TRANSFORM_FILES_TMPDIR)%,$(1))
 undebian_transform_files = $(patsubst $(DEB_TRANSFORM_FILES_TMPDIR)%,%,$(1))
+debian_transform_script = $(if $(DEB_TRANSFORM_SCRIPT_$(cdbs_curpkg)_$(call undebian_transform_files,$(1))), \
+	$(DEB_TRANSFORM_SCRIPT_$(cdbs_curpkg)_$(call undebian_transform_files,$(1))), \
+	$(if $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$(1))), \
+		$(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$(1))), \
+		debian/transform_$(notdir $(call undebian_transform_files,$(1)))))
 
 common-build-arch common-build-indep:: $(foreach file,$(DEB_TRANSFORM_FILES),$(call debian_transform_files,$(file)))
 
 $(call debian_transform_files,%): $(call debian_check_files,%)
 	mkdir -p $(@D)
-	chmod +x debian/transform_$(notdir $(call undebian_transform_files,$@))
-	$(if $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$@)), \
-	    $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$@)), \
-	    debian/transform_$(notdir $(call undebian_transform_files,$@))) < $< > $@
+	chmod +x $(call debian_transform_script,$@)
+	$(call debian_transform_script,$@) < $< > $@
 
 $(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
 	set -e; \