X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=0e24d3006a8f690c5b064bc63796568fabb126e9;hb=c91cb5aed3054f0bba98d9d35dd07f7c1ad0ffff;hp=5483184876277ccf3dda8d4718ef7d177348b6b8;hpb=524bacb7b8f4220960427cd862f8e25ffce8c1a6;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 5483184..0e24d30 100644
--- a/configure.in
+++ b/configure.in
@@ -35,6 +35,17 @@ if test x"$srcdir" != 'x.' ; then
     exit 1
 fi
 
+#
+# Remove common automounter nonsense + convert from UNC to DOS style paths
+# (UNC awareness isn't quite there yet for cygwin32-beta18 and consituent tools.)
+#
+hardtop=`pwd`
+hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|' | sed 's|^//\(.\)/|\1:/|' `
+
+echo ''
+echo "*** The top of your build tree is: $hardtop"
+# subst of hardtop is done below after we've computed hardtop_plat.
+
 dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
 dnl--------------------------------------------------------------------
@@ -255,15 +266,15 @@ powerpc-ibm-aix*)
         HostVendor_CPP='ibm'
         HostOS_CPP='aix'
         ;;
-powerpc-apple-macosx*)
-      HostPlatform=powerpc-apple-macosx
-      TargetPlatform=powerpc-apple-macosx #hack
-      BuildPlatform=powerpc-apple-macosx #hack
-        HostPlatform_CPP='powerpc_apple_macosx'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='apple'
-        HostOS_CPP='macosx'
-        ;;
+powerpc-apple-darwin*)
+	HostPlatform=powerpc-apple-darwin
+	TargetPlatform=powerpc-apple-darwin #hack
+	BuildPlatform=powerpc-apple-darwin #hack
+	HostPlatform_CPP='powerpc_apple_darwin'
+	HostArch_CPP='powerpc'
+	HostVendor_CPP='apple'
+	HostOS_CPP='darwin'
+	;;
 sparc-sun-sunos4*)
 	HostPlatform=sparc-sun-sunos4
 	TargetPlatform=sparc-sun-sunos4 #hack
@@ -326,27 +337,19 @@ dnl AC_SUBST(TargetVendor_CPP)
 AC_SUBST(exeext)
 
 #
-# Remove common automounter nonsense + convert from UNC to DOS style paths
-# (UNC awareness isn't quite there yet for cygwin32-beta18 and consituent tools.)
-#
-hardtop=`pwd`
-hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mnt/|/|' | sed 's|^/grasp_tmp|/local/grasp_tmp|' | sed 's|^//\(.\)/|\1:/|' `
-
-echo ''
-echo "*** The top of your build tree is: $hardtop"
+# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box).
+# (but with b-slashes being escaped).
 case $HostPlatform in
-  i386-unknown-mingw32)
-  	hardtop_plat=`cygpath -w ${hardtop}`
-	;;
-  i386-unknown-cygwin32)
-  	hardtop_plat=`cygpath -w ${hardtop}`
+  i386-unknown-mingw32 | i386-unknown-cygwin32)
+  	# get rid off /cygdrive/ prefix
+	hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' `
+  	hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' `
 	;;
   *)
   	hardtop_plat=${hardtop}
 	;;
 esac
 AC_SUBST(hardtop)
-# The native format (i.e., right kind of slashes on a Win32 box).
 AC_SUBST(hardtop_plat)
 
 dnl --------------------------------------------------------------