X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=tools%2FMakefile.am;h=2ecd0eeeaf749bd795934fd2f7f5c0d052454eb2;hb=730fb50780df860474dc1fae16c9891187e99c82;hp=806f24447e72440c2fcfb7e3362532a66cb1f90a;hpb=ca03635a4c83afbe9b51fe846a8b3d5361462a90;p=libguestfs.git

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 806f244..2ecd0ee 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -13,12 +13,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/subdir-rules.mk
 
 tools = \
-	edit \
 	list-filesystems \
 	list-partitions \
 	make-fs \
@@ -26,7 +25,6 @@ tools = \
 	win-reg
 
 EXTRA_DIST = \
-	run-locally \
 	$(tools:%=virt-%) \
 	test-virt-*.sh
 
@@ -38,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 $@ \
 	  $<
 
@@ -63,6 +61,7 @@ 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 \