X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=375d2c17854765d4d23df484416eef5a71090df2;hb=f986a83107850e6031a0635d49fe99d8a3e9085e;hp=b364f575851f3921b7c4495c0840de588495c29d;hpb=028d076605ade76f738fab91fdf3da3baa976c30;p=ghc-hetmet.git

diff --git a/validate b/validate
index b364f57..375d2c1 100644
--- a/validate
+++ b/validate
@@ -48,7 +48,7 @@ done
 if [ "$CPUS" = "" ]; then
     threads=2
 else
-    threads=$((($CPUS + 1) * 2)) # `expr $CPUS + 1`
+    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
 fi
 
 if [ $testsuite_only -eq 0 ]; then
@@ -58,6 +58,11 @@ if [ $no_clean -eq 0 ]; then
         make distclean
     fi
 
+    INSTDIR=`pwd`/inst
+    if [ "$OSTYPE" = "cygwin" ]
+    then
+        INSTDIR=`cygpath -m "$INSTDIR"`
+    fi
     case $OSTYPE in
         cygwin|msys) config_args=--build=i386-unknown-mingw32
             if [ -f c:/mingw/bin/gcc.exe ]
@@ -72,10 +77,10 @@ if [ $no_clean -eq 0 ]; then
     esac
 
     sh boot
-    ./configure "--prefix=`pwd`/inst" $config_args
+    ./configure --prefix="$INSTDIR" $config_args
 fi
 
-thisdir=`utils/pwd/pwd forwardslash`
+thisdir=`utils/ghc-pwd/ghc-pwd`
 
 echo "Validating=YES" > mk/are-validating.mk