[project @ 2001-11-19 18:47:43 by sof]

- change the interpretation of FPTOOLS_TOP_ABS, it is now the UNIXy path.
  For Win32, it is of the form <drive>:<path> where '/' is the directory
  separator. Prior to this commit, the directory separator was '\'.
- for the (only) place we need to have a platform-native representation
  of FPTOOLS_TOP_ABS, use FPTOOLS_TOP_ABS_PLATFORM.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 8006fc7..23042a4 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.202 2001/11/09 21:25:56 sof Exp $
+# $Id: Makefile,v 1.203 2001/11/19 18:47:43 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -383,7 +383,7 @@ all :: ghc-inplace
 ghc-inplace : $(HS_PROG)
        @$(RM) $@
        echo '#!/bin/sh' >>$@
-       echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) '-B$(FPTOOLS_TOP_ABS)' '"$$@"' >>$@
+       echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(FPTOOLS_TOP_ABS_PLATFORM)' '"$$@"' >>$@
        chmod 755 $@
 
 CLEAN_FILES += ghc-inplace

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 638791b..ea61013 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -436,10 +436,10 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR         = C:/TEMP
 endif
 
-# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (platform-specific format).
-FPTOOLS_TOP_ABS                = @hardtop_plat@
-# Keep the Unix-style path to use with Unix tools (e.g. in ghc-inplace script)
-FPTOOLS_TOP_ABS_UNIX    = @hardtop@
+# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path. (POSIX / unix-style path).
+FPTOOLS_TOP_ABS                = @hardtop@
+# The platform specific version of 'hardtop'.
+FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
 
 #
 # Installation directories, we don't use half of these,