X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2FMakefile.am;h=8391b8b3ab047d294da628768ef6addcb92c79a4;hp=75fd594f001e41672b7707d92265433cf8e4a255;hb=641f6ae3bf14940d9057860fb022c2946c1daf1c;hpb=3b5c29f589d4637af4a6f0453975a3df13a6113d

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 75fd594..8391b8b 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -16,9 +16,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 EXTRA_DIST = \
-	make.sh update.sh supermin-split.sh supermin-make.sh \
 	libguestfs-supermin-helper \
-	kmod.whitelist \
 	kmod.whitelist.in \
 	packagelist.in \
 	init \
@@ -59,8 +57,8 @@ 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
 
 $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd init update.sh
@@ -98,17 +96,14 @@ endif
 
 # Extra symlinks needed by the Debian appliance.
 debirf_symlinks = \
-	a0_motd \
 	a0_prep-root \
-	network \
-	root-bashrc \
-	serial-terminal \
 	z0_remove-aptitude \
 	z0_remove-locales \
 	z1_clean-root
 noinst_DATA = $(debirf_symlinks:%=debian/modules/%)
 $(debirf_symlinks:%=debian/modules/%): stamp-debirf-modules
 stamp-debirf-modules:
+	mkdir -p debian/modules
 	for f in $(debirf_symlinks); do \
 	  ln -sf /usr/share/debirf/modules/$$f debian/modules/$$f; \
 	done
@@ -147,7 +142,7 @@ test-boot-realistic: emptydisk
 
 # Make clean.
 
-CLEANFILES = $(APPLIANCE_FILES)
+CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles
 
 clean-local:
 	rm -rf $(top_builddir)/initramfs