X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=perl%2FMakefile.am;h=e924cb1d6134af1b7ddbf09b9582793488717f24;hp=e1a645595439f0cb57f12eecfc71d3a3daa921ae;hb=cd077b8229731e292798f34dd56892cbfa6f1e0e;hpb=f8ee7869f4836427109959cf20e299a31fa86eaf

diff --git a/perl/Makefile.am b/perl/Makefile.am
index e1a6455..e924cb1 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -13,7 +13,7 @@
 #
 # 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
 
@@ -46,7 +46,7 @@ src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
 # Images used by tests
 .PHONY: test_images
 test_images:
-	$(MAKE) -C $(top_builddir)/images
+	$(MAKE) -C $(top_builddir)/tests/data
 
 TESTS = run-bindtests run-perl-tests
 
@@ -54,15 +54,15 @@ $(TESTS): src_deps all appliance test_images
 
 TESTS_ENVIRONMENT = \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
-	LIBGUESTFS_PATH=$(top_builddir)/appliance
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir)
 
 INSTALLDIRS = site
 
 all: Makefile-pl src_deps
 	$(MAKE) -f Makefile-pl
 
-Makefile-pl: Makefile.PL $(top_srcdir)/src/MAX_PROC_NR
-	cd $(top_srcdir) && ./config.status --recheck
+Makefile-pl: Makefile.PL
 	perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
 
 # No!  Otherwise it is deleted before the clean-local rule runs.