From 53f5ea28ffe26c112e51ebdef6d46c25919ced4f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 24 Jun 2009 15:35:59 +0100 Subject: [PATCH] Fix permissions on generated scripts in the appliance/ directory. --- appliance/Makefile.am | 10 ---------- configure.ac | 17 +++++++++++------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 74157b0..c06d7ae 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -92,16 +92,6 @@ $(SUPERMINIMG): supermin.incfiles supermin-make.sh endif -# This should rebuild the scripts if the input files change, although -# it doesn't always seem to work. -%.sh: %.sh.in - cd .. && ./config.status appliance/$@ - chmod +x $@ - -libguestfs-supermin-helper: libguestfs-supermin-helper.in - cd .. && ./config.status appliance/$@ - chmod +x $@ - #---------------------------------------------------------------------- # Extra rules for testing the appliance. diff --git a/configure.ac b/configure.ac index 42f0127..386bec5 100644 --- a/configure.ac +++ b/configure.ac @@ -506,12 +506,20 @@ AC_CONFIG_SUBDIRS([daemon]) dnl Produce output files. AC_CONFIG_HEADERS([config.h]) +dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html +AC_CONFIG_FILES([appliance/make.sh], + [chmod +x appliance/make.sh]) +AC_CONFIG_FILES([appliance/update.sh], + [chmod +x appliance/update.sh]) +AC_CONFIG_FILES([appliance/supermin-split.sh], + [chmod +x appliance/supermin-split.sh]) +AC_CONFIG_FILES([appliance/supermin-make.sh], + [chmod +x appliance/supermin-make.sh]) +AC_CONFIG_FILES([appliance/libguestfs-supermin-helper], + [chmod +x appliance/libguestfs-supermin-helper]) AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile po/Makefile.in examples/Makefile appliance/Makefile - appliance/make.sh appliance/update.sh - appliance/supermin-split.sh appliance/supermin-make.sh - appliance/libguestfs-supermin-helper images/Makefile capitests/Makefile regressions/Makefile @@ -526,9 +534,6 @@ AC_CONFIG_FILES([Makefile ocaml/META perl/Makefile.PL]) AC_OUTPUT -dnl WTF? -chmod +x appliance/*.sh appliance/libguestfs-supermin-helper - dnl Produce summary. echo echo -- 1.8.3.1