X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=validate;h=245d0bd4fc52e1f3177784913be0aaa5500bd7a1;hb=afd6da0d938747f45b16c8d6eb5d786e59a21218;hp=01d6a829e604270d697028b3be8bcaf07f3d83f4;hpb=15f7bc388dc47147bfcbb07f43afb70788369d4e;p=ghc-hetmet.git

diff --git a/validate b/validate
index 01d6a82..245d0bd 100644
--- a/validate
+++ b/validate
@@ -55,10 +55,17 @@ else
     threads="$THREADS"
 fi
 
+if type gmake > /dev/null 2> /dev/null
+then
+    make="gmake"
+else
+    make="make"
+fi
+
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then
-    make maintainer-clean NO_CLEAN_GMP=YES
+    $make maintainer-clean NO_CLEAN_GMP=YES
 
     INSTDIR=`pwd`/inst
     if [ "$OSTYPE" = "cygwin" ]
@@ -66,7 +73,7 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    sh boot
+    /usr/bin/perl -w boot
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
@@ -74,10 +81,10 @@ thisdir=`utils/ghc-pwd/ghc-pwd`
 
 echo "Validating=YES" > mk/are-validating.mk
 
-make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
 
-make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
+$make binary-dist-prep
+$make test_bindist TEST_PREP=YES
 
 fi # testsuite-only
 
@@ -91,7 +98,7 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
+$make test stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then