X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/be43c2885802175af62c192978fc5652bfe28f40..28e4629b14cae93d919883c11997e6bf9247b222:/transform-files.mk

diff --git a/transform-files.mk b/transform-files.mk
index 43ab6c0..c75e861 100644
--- a/transform-files.mk
+++ b/transform-files.mk
@@ -17,6 +17,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
+# Don't include transform-files.mk in your rules files directly;
+# instead use config-package.mk.
+
 ifndef _cdbs_rules_transform_files
 _cdbs_rules_transform_files = 1
 
@@ -24,26 +27,31 @@ include /usr/share/cdbs/1/rules/check-files.mk
 
 DEB_TRANSFORM_FILES = $(foreach package,$(DEB_ALL_PACKAGES),$(DEB_TRANSFORM_FILES_$(package)))
 
-DEB_TRANSFORM_FILES_DIR=debian/transform_file_copies
+DEB_TRANSFORM_FILES_TMPDIR=debian/transform_file_copies
 
-debian_transform_files = $(patsubst %,$(DEB_TRANSFORM_FILES_DIR)%,$(1))
-undebian_transform_files = $(patsubst $(DEB_TRANSFORM_FILES_DIR)%,%,$(1))
+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)); \
-		cp -a $(DEB_TRANSFORM_FILES_DIR)$(file) \
-		    $(DEB_DESTDIR)/$(dir $(file));)
+		install -d debian/$(cdbs_curpkg)/$(dir $(file)); \
+		cp -a $(call debian_transform_files,$(file)) \
+		    debian/$(cdbs_curpkg)/$(dir $(file));)
 
 clean::
-	rm -rf $(DEB_TRANSFORM_FILES_DIR)
+	rm -rf $(DEB_TRANSFORM_FILES_TMPDIR)
 
 endif