X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=efde00078b5f3caa19a73aff93b3f053015bf3ed;hb=213988115a8fd25266050228ac5184264f56baf8;hp=771ee21d2157df746fa08352bfbba63b29a34cb0;hpb=29204fe10d6ad46bace50e82557cb95e8a0f3529;p=libguestfs.git diff --git a/Makefile.am b/Makefile.am index 771ee21..efde000 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,7 @@ SUBDIRS += inspector endif EXTRA_DIST = \ + config.rpath \ make-initramfs.sh update-initramfs.sh \ guestfs.pod guestfs-actions.pod guestfs-structs.pod \ guestfish.pod guestfish-actions.pod \ @@ -63,7 +64,8 @@ EXTRA_DIST = \ contrib/fedora-libguestfs.spec \ contrib/febootstrap/install.title \ contrib/febootstrap/install.html \ - contrib/febootstrap/install.sh + contrib/febootstrap/install.sh \ + test-bootbootboot.sh # Build the root filesystem. # Currently this is arch-dependent, so it seems like putting it in @@ -105,7 +107,8 @@ tests_LDADD = $(top_builddir)/src/libguestfs.la TESTS = tests test-bootbootboot.sh TESTS_ENVIRONMENT = \ SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \ - SKIP_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \ + SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \ + SKIP_TEST_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \ $(VG) $(TESTS): $(INITRAMFS) $(VMLINUZ)