0
@@ -11,7 +11,7 @@ DIST_DIRS = scripts
0
 EXTRA_DIST = doc scripts TODO t memcached.spec
0
 
0
 test:  memcached-debug
0
-	prove t
0
+	prove $(srcdir)/t
0
 
0
 dist-hook:
0
   rm -rf $(distdir)/doc/.svn/

0
@@ -3,10 +3,15 @@ use strict;
0
 use IO::Socket::INET;
0
 use IO::Socket::UNIX;
0
 use Exporter 'import';
0
-use FindBin qw($Bin);
0
 use Carp qw(croak);
0
 use vars qw(@EXPORT);
0
 
0
+# Instead of doing the substitution with Autoconf, we assume that
0
+# cwd == builddir.
0
+use Cwd;
0
+my $builddir = getcwd;
0
+
0
+
0
 @EXPORT = qw(new_memcached sleep mem_get_is mem_gets mem_gets_is mem_stats free_port);
0
 
0
 sub sleep {
0
@@ -131,7 +136,7 @@ sub free_port {
0
 }
0
 
0
 sub supports_udp {
0
-    my $output = `$Bin/../memcached-debug -h`;
0
+    my $output = `$builddir/memcached-debug -h`;
0
     return 0 if $output =~ /^memcached 1\.1\./;
0
     return 1;
0
 }
0
@@ -149,7 +154,7 @@ sub new_memcached {
0
     }
0
     my $childpid = fork();
0
 
0
-    my $exe = "$Bin/../memcached-debug";
0
+    my $exe = "$builddir/memcached-debug";
0
     croak("memcached binary doesn't exist.  Haven't run 'make' ?\n") unless -e $exe;
0
     croak("memcached binary not executable\n") unless -x _;
0