X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/567091347bd3fe6087395e06f4d50dd24ff0571c..ccd4ff37bd20d9084bdfb91fd55291131c39d286:/transform-files.mk

diff --git a/transform-files.mk b/transform-files.mk
index d0de55a..c75e861 100644
--- a/transform-files.mk
+++ b/transform-files.mk
@@ -31,20 +31,25 @@ 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)
-	$(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; \
 	$(foreach file,$(DEB_TRANSFORM_FILES_$(cdbs_curpkg)), \
-		install -d $(DEB_DESTDIR)/$(dir $(file)); \
+		install -d debian/$(cdbs_curpkg)/$(dir $(file)); \
 		cp -a $(call debian_transform_files,$(file)) \
-		    $(DEB_DESTDIR)/$(dir $(file));)
+		    debian/$(cdbs_curpkg)/$(dir $(file));)
 
 clean::
 	rm -rf $(DEB_TRANSFORM_FILES_TMPDIR)