diff --git a/.cvsignore b/.cvsignore
index e5a60074ff07a9a382591e36044c41aa808cb469..2e3885ef685a5fa090e13e0797e9549f24815faf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 Pike*
 build
+xenofarm_result
diff --git a/.gitignore b/.gitignore
index e62e67cac8af818669b0a62cd025e31dee3d23bd..c616d46487c967df516a968e52ae94f3ef0e0589 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ _$*
 core
 /Pike*
 /build
+/xenofarm_result
diff --git a/Makefile b/Makefile
index 26e9cd4fbc8dd7679570a74dba18e6c68c17aff7..9fd926af1f4ada68e698f77872a37c174e300583 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.119 2003/06/17 23:19:17 mast Exp $
+# $Id: Makefile,v 1.120 2003/09/12 09:39:48 nilsson Exp $
 #
 # Meta Makefile
 #
@@ -266,13 +266,12 @@ xenofarm_feature:
 	  xenofarm
 
 xenofarm:
-	test -d build || mkdir build
-	-rm -rf build/xenofarm
-	mkdir build/xenofarm
-	-CCACHE_LOGFILE="`pwd`/build/xenofarm/ccache.log.txt" \
+	-rm -rf xenofarm_result
+	mkdir xenofarm_result
+	-CCACHE_LOGFILE="`pwd`/xenofarm_result/ccache.log.txt" \
 	  MAKE="$(MAKE_CMD)" CONFIGUREARGS="$(CONFIGUREARGS)" \
 	  BUILDDIR="$(BUILDDIR)" /bin/sh bin/xenofarm.sh
-	cd build/xenofarm && tar cf - . > ../../xenofarm_result.tar
+	cd xenofarm_result && tar cf - . > ../xenofarm_result.tar
 	gzip -f9 xenofarm_result.tar
 
 benchmark:
diff --git a/bin/xenofarm.sh b/bin/xenofarm.sh
index 22e3b8edcdd8905743956b3be3fd85d787375708..c6a9f353025348b9ca4f9f1b56aa70f675c10cff 100755
--- a/bin/xenofarm.sh
+++ b/bin/xenofarm.sh
@@ -1,16 +1,16 @@
 #! /bin/sh
 
-# $Id: xenofarm.sh,v 1.19 2003/03/28 10:19:49 grubba Exp $
+# $Id: xenofarm.sh,v 1.20 2003/09/12 09:40:20 nilsson Exp $
 # This file scripts the xenofarm actions and creates a result package
 # to send back.
 
 log() {
-  echo $1 | tee -a build/xenofarm/mainlog.txt
+  echo $1 | tee -a xenofarm_result/mainlog.txt
 }
 
 log_start() {
   log "BEGIN $1"
-  TZ=GMT date >> build/xenofarm/mainlog.txt
+  TZ=GMT date >> xenofarm_result/mainlog.txt
 }
 
 log_end() {
@@ -20,12 +20,12 @@ log_end() {
   else
     log "FAIL"
   fi
-  TZ=GMT date >> build/xenofarm/mainlog.txt
+  TZ=GMT date >> xenofarm_result/mainlog.txt
 }
 
 xenofarm_build() {
   log_start compile
-  $MAKE $MAKE_FLAGS > build/xenofarm/compilelog.txt 2>&1
+  $MAKE $MAKE_FLAGS > xenofarm_result/compilelog.txt 2>&1
   log_end $?
   [ $LASTERR = 0 ] || return 1
 }
@@ -33,12 +33,12 @@ xenofarm_build() {
 xenofarm_post_build() {
   log_start verify
   $MAKE $MAKE_FLAGS METATARGET=verify TESTARGS="-a -T" > \
-    build/xenofarm/verifylog.txt 2>&1
+    xenofarm_result/verifylog.txt 2>&1
   log_end $?
   [ $LASTERR = 0 ] || return 1
   
   log_start export
-  $MAKE $MAKE_FLAGS bin_export > build/xenofarm/exportlog.txt 2>&1
+  $MAKE $MAKE_FLAGS bin_export > xenofarm_result/exportlog.txt 2>&1
   log_end $?
   [ $LASTERR = 0 ] || return 1
 }
@@ -63,9 +63,9 @@ fi
 
 log_start response_assembly
   # Basic stuff
-  cp buildid.txt build/xenofarm/
+  cp buildid.txt xenofarm_result/
   # Configuration
-  cp "$BUILDDIR/config.info" build/xenofarm/configinfo.txt || /bin/true
+  cp "$BUILDDIR/config.info" xenofarm_result/configinfo.txt || /bin/true
   (
     cd "$BUILDDIR"
     test -f config.log && cat config.log
@@ -76,8 +76,8 @@ log_start response_assembly
       echo
       cat "$f"
     done
-  ) > build/xenofarm/configlogs.txt
-  cp "$BUILDDIR/config.cache" build/xenofarm/configcache.txt || /bin/true;
+  ) > xenofarm_result/configlogs.txt
+  cp "$BUILDDIR/config.cache" xenofarm_result/configcache.txt || /bin/true;
   # Compilation
   if test "`find $BUILDDIR -name '*.fail' -print`" = ""; then :; else
     (
@@ -86,24 +86,24 @@ log_start response_assembly
       echo "The following file(s) failed to compile with full optimization."
       echo "This may affect performance negatively."
       find . -name '*.fail' -print | sed -e 's/\.fail$$//' -e 's/^/	/'
-    ) >build/xenofarm/compilation_failure.txt
+    ) >xenofarm_result/compilation_failure.txt
   fi
   # Installation
-  cp "$BUILDDIR/dumpmodule.log" build/xenofarm/dumplog.txt || /bin/true
+  cp "$BUILDDIR/dumpmodule.log" xenofarm_result/dumplog.txt || /bin/true
   # Testing
-  if test ! -f "build/xenofarm/exportlog.txt"; then
-    cp "$BUILDDIR/testsuite" build/xenofarm/testsuite.txt || /bin/true;
+  if test ! -f "xenofarm_result/exportlog.txt"; then
+    cp "$BUILDDIR/testsuite" xenofarm_result/testsuite.txt || /bin/true;
   fi
   # Core files
   find . -name "core" -exec \
     gdb --batch --nx --command=bin/xenofarm_gdb_cmd "$BUILDDIR/pike" {} >> \
-       build/xenofarm/_core.txt ";"
+       xenofarm_result/_core.txt ";"
   find . -name "*.core" -exec \
     gdb --batch --nx --command=bin/xenofarm_gdb_cmd "$BUILDDIR/pike" {} >> \
-      build/xenofarm/_core.txt ";"
+      xenofarm_result/_core.txt ";"
   find . -name "core.*" -exec \
     gdb --batch --nx --command=bin/xenofarm_gdb_cmd "$BUILDDIR/pike" {} >> \
-      build/xenofarm/_core.txt ";"
+      xenofarm_result/_core.txt ";"
 log_end $?
 
 log "END"