X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=tools%2FMakefile.am;h=5586bf8dae96a95e9d84d47284f29fd216ffe075;hb=bd1cc1273105b4f88a6132aafa8a67af7dcccff7;hp=180304969ceeb8c91fe0048443c7ffa1f0bffbf1;hpb=a6054bf90f39a84c1a8f8f7d3b9e81e84cb13696;p=libguestfs.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1803049..5586bf8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs virt-* tools
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,16 +18,13 @@
 include $(top_srcdir)/subdir-rules.mk
 
 tools = \
-	edit \
 	list-filesystems \
 	list-partitions \
 	make-fs \
-	resize \
 	tar \
 	win-reg
 
 EXTRA_DIST = \
-	run-locally \
 	$(tools:%=virt-%) \
 	test-virt-*.sh
 
@@ -39,20 +36,20 @@ bin_SCRIPTS = $(tools:%=virt-%)
 
 # Manual pages and HTML files for the website.
 
-# XXX Bug in automake?  If you list virt-edit.1 explicitly, then it
+# XXX Bug in automake?  If you list virt-tar.1 explicitly, then it
 # builds and installs the man pages.  However if this is removed,
 # then the man pages are neither built nor installed.
-man_MANS = virt-edit.1 $(patsubst %,virt-%.1,$(filter-out edit,$(tools)))
+man_MANS = virt-tar.1 $(patsubst %,virt-%.1,$(filter-out tar,$(tools)))
 
 noinst_DATA = $(tools:%=$(top_builddir)/html/virt-%.1.html)
 
 virt-%.1: virt-%
-	$(top_srcdir)/podwrapper.sh \
+	$(top_builddir)/podwrapper.sh \
 	  --man $@ \
 	  $<
 
 $(top_builddir)/html/virt-%.1.html: virt-%
-	$(top_srcdir)/podwrapper.sh \
+	$(top_builddir)/podwrapper.sh \
 	  --html $@ \
 	  $<
 
@@ -64,11 +61,11 @@ TESTS_ENVIRONMENT = \
 	MALLOC_PERTURB_=$(random_val) \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir) \
 	PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
 
 TESTS = test-virt-list-filesystems.sh \
 	test-virt-make-fs.sh \
-	test-virt-resize.sh \
 	test-virt-tar.sh
 
 endif