X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=13d1e3a16cfa781ad5eb41b6bbc74a0be224eba8;hb=e8275a4f4706e544df8624c2b6b469afaf05a8a5;hp=034f7fb559f252d96230f63fd04ec1a38d2f597e;hpb=1c8be26abfdf428973bce2a7fab740020accc286;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 034f7fb..13d1e3a 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ fi
 # Remove some automounter nonsense (Glasgow specific gruff)
 #
 hardtop=`pwd`
-hardtop=`echo $hardtop | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|'`
+hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|'`
 
 echo ''
 echo "*** The top of your build tree is: $hardtop"
@@ -388,11 +388,14 @@ AC_SUBST(CompressSuffix)
 dnl ** check for installed happy binary + version
 #
 AC_HAPPY
-if expr $HappyVersion \< "1.3" >/dev/null; then
+
+if test x"$HappyCmd" != x; then
+   if expr $HappyVersion \< "1.3" >/dev/null; then
 	echo "   Happy Version 1.3 or later is required to compile GHC."
 	echo "   Using the Happy sources in the tree.";
 	HappyCmd=""
-fi;
+   fi
+fi
 
 #
 #