X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=e9e02bfa9d49140896d9032b87ee6cc126bc9091;hp=fc397cda2534f2d542bf8ab75cd51ea460ed2d85;hb=9c16028a2317a4e1ae5b0831a8a71c98c86852ae;hpb=d70248333edf8a5b5f509609cf2c8f7fd77d5e05 diff --git a/Makefile.am b/Makefile.am index fc397cd..e9e02bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,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 @@ -106,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) @@ -180,11 +182,18 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar sh make-recipes.sh recipes/*.sh > $@-t mv $@-t $@ -website: html/guestfs.3.html html/guestfish.1.html \ +HTMLFILES = html/guestfs.3.html html/guestfish.1.html \ html/virt-inspector.1.html \ - html/recipes.html - cp $^ html/pod.css html/recipes.css \ - $(HOME)/d/redhat/et-website/libguestfs/ + html/recipes.html \ + html/pod.css html/recipes.css + +TEXTFILES = README TODO HACKING + +WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs + +website: $(HTMLFILES) $(TEXTFILES) + cp $(HTMLFILES) $(WEBSITEDIR) + for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done # Generate the ChangeLog automatically from the gitlog.