X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=b9bf95338bf30cf2e02ef1bfe8ec836a5babc057;hp=6c8a972e2ff79edb7d254bd8caf040b803f31786;hb=cc9b2e30e5f6d6e77c60e3f501969c4a478899da;hpb=551baf3082bf4a346a8320df182cb3840418388f

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 6c8a972..b9bf953 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -23,7 +23,8 @@ EXTRA_DIST = \
 	debian/modules/install_kernel \
 	debian/modules/y0_install-guestfsd \
 	debian/modules/z99_final-cleanups \
-	debian/debirf.conf.in
+	debian/debirf.conf.in \
+	make.sh.in
 
 # Build the root filesystem (appliance).
 # Currently this is arch-dependent, so it seems like putting it in
@@ -57,10 +58,19 @@ endif
 $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log
 
 $(top_builddir)/initramfs/fakeroot.log: make.sh kmod.whitelist packagelist
-	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-	-mv $(VMLINUZ) $(VMLINUZ).bak
+	mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak 2>/dev/null; :
+	mv $(VMLINUZ) $(VMLINUZ).bak 2>/dev/null; :
 	if ! bash make.sh; then rm -f $@; exit 1; fi
 
+# This used to be a configure-generated file (as is update.sh still).
+# However config.status always touches the destination file, which
+# means the appliance got rebuilt too often.
+make.sh: make.sh.in
+	cd $(top_builddir) && \
+	  ./config.status --file=appliance/$@-t:appliance/$<
+	chmod +x $@-t
+	mv $@-t $@
+
 $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
 	rm -f $@
 	bash update.sh
@@ -146,4 +156,3 @@ CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles
 
 clean-local:
 	rm -rf $(top_builddir)/initramfs
-