Revert last change since it breaks running the test suite

when builddir is different from srcdir.

tests/httpserver.pl

@@ -4,7 +4,7 @@ use strict;
 
 my $verbose=0; # set to 1 for debugging
 
-my $srcdir=".";
+my $dir=".";
 my $port = 8999; # just a default
 my $ipv6;
 my $pid=".http.pid"; # name of the pidfile
@@ -14,7 +14,7 @@ do {
         $verbose=1;
     }
     elsif($ARGV[0] eq "-d") {
-        $srcdir=$ARGV[1];
+        $dir=$ARGV[1];
         shift @ARGV;
     }
     elsif($ARGV[0] eq "-p") {
@@ -33,4 +33,4 @@ do {
     }
 } while(shift @ARGV);
 
-exec("$srcdir/server/sws --pidfile $pid$fork $ipv6$port $srcdir");
+exec("server/sws --pidfile $pid$fork $ipv6$port $dir");