X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=e9e02bfa9d49140896d9032b87ee6cc126bc9091;hp=966b59322d14e034e66eaf9939aa72fd38f62da9;hb=6b668620681ada82857e09922a0feb004ee65882;hpb=b28815d7bf03d156af0276a11433638dcd736662 diff --git a/Makefile.am b/Makefile.am index 966b593..e9e02bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,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) @@ -181,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.