X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=0e24d3006a8f690c5b064bc63796568fabb126e9;hb=5ca4a0134475bbc790af6ce7d7517a97e877bff6;hp=0eda0d3beec29b63c079d18c078673f387cf8c62;hpb=f8bd123ff75666c83061a891000d745ede3b55f5;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 0eda0d3..0e24d30 100644
--- a/configure.in
+++ b/configure.in
@@ -44,8 +44,7 @@ hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mn
 
 echo ''
 echo "*** The top of your build tree is: $hardtop"
-AC_SUBST(hardtop)
-
+# subst of hardtop is done below after we've computed hardtop_plat.
 
 dnl--------------------------------------------------------------------
 dnl * Choose host(/target/build) platform
@@ -267,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
@@ -339,18 +338,18 @@ AC_SUBST(exeext)
 
 #
 # 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)
 AC_SUBST(hardtop_plat)
 
 dnl --------------------------------------------------------------