Fix marking transform scripts as executable when DEB_TRANSFORM_SCRIPT_package is used.

git-svn-id: svn+ssh://svn.mit.edu/athena/trunk/debathena/debathena/config-package-dev@23993 728af825-273c-0410-89f9-f7d3b574a069

diff --git a/debian/changelog b/debian/changelog
index f148a46691b92149b6b566a0e5dc4abc3b7b1b41..90d90930e4fd08ff9e1bbd197c722555b8c65d77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+config-package-dev (4.11) unstable; urgency=low
+
+  * Fix marking transform scripts as executable when
+    DEB_TRANSFORM_SCRIPT_package is used.
+
+ -- Tim Abbott <tabbott@mit.edu>  Sat, 05 Sep 2009 11:46:54 -0400
+
 config-package-dev (4.10) unstable; urgency=low
 
   * Mark transform scripts as executable before attempting to execute them

diff --git a/transform-files.mk b/transform-files.mk
index 284a1dd2f4ecd9fb1296d065acaceaf1d999986b..5c500b624cc6b3320f7472976b57be2bfb5846ab 100644 (file)
--- a/transform-files.mk
+++ b/transform-files.mk
@@ -31,15 +31,16 @@ 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_$(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; \