From 99ecf76790a91bc0b15ce9e65894350ffa689aef Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 5 Sep 2009 15:48:19 +0000 Subject: [PATCH] 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 --- debian/changelog | 7 +++++++ transform-files.mk | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f148a46..90d9093 100644 --- 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 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 284a1dd..5c500b6 100644 --- 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; \ -- 2.45.0