Fix permissions on generated scripts in the appliance/ directory.
authorRichard W.M. Jones <rjones@redhat.com>
Wed, 24 Jun 2009 14:35:59 +0000 (15:35 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Wed, 24 Jun 2009 14:35:59 +0000 (15:35 +0100)
appliance/Makefile.am
configure.ac

index 74157b0..c06d7ae 100644 (file)
@@ -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.
 
index 42f0127..386bec5 100644 (file)
@@ -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