projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1997-10-13 09:44:11 by simonm]
[ghc-hetmet.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
034f7fb
..
13d1e3a
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-31,7
+31,7
@@
fi
# Remove some automounter nonsense (Glasgow specific gruff)
#
hardtop=`pwd`
# 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"
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
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=""
echo " Happy Version 1.3 or later is required to compile GHC."
echo " Using the Happy sources in the tree.";
HappyCmd=""
-fi;
+ fi
+fi
#
#
#
#