From: panne <unknown>
Date: Wed, 4 Jun 2003 15:18:30 +0000 (+0000)
Subject: [project @ 2003-06-04 15:18:29 by panne]
X-Git-Tag: Approx_11550_changesets_converted~814
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4d65dec814743bb685ea590503bb54dd5b18023b;hp=ac1c3b1136c6aa83fd4e3fa3ea97f178dde9d4ab;p=ghc-hetmet.git

[project @ 2003-06-04 15:18:29 by panne]
Tentative fixes for Cywgin/MinGW-style pathname confusion
---

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index 13b02be..1cad689 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.21 2002/11/18 10:45:45 simonmar Exp $
+# $Id: Makefile,v 1.22 2003/06/04 15:18:29 panne Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -43,7 +43,7 @@ PKGCONF=$(libdir)/package.conf
 endif # BIN_DIST
 else
 GHCPKGBIN=$(FPTOOLS_TOP_ABS)/ghc/utils/ghc-pkg/$(HS_PROG)
-PKGCONF=$(FPTOOLS_TOP_ABS)/ghc/driver/package.conf.inplace
+PKGCONF=$(FPTOOLS_TOP_ABS_PLATFORM)/ghc/driver/package.conf.inplace
 endif
 
 ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
diff --git a/ghc/utils/hsc2hs/Makefile b/ghc/utils/hsc2hs/Makefile
index b1280c9..562803a 100644
--- a/ghc/utils/hsc2hs/Makefile
+++ b/ghc/utils/hsc2hs/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.37 2003/02/07 22:26:08 sof Exp $
+# $Id: Makefile,v 1.38 2003/06/04 15:18:30 panne Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -50,13 +50,13 @@ HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
 endif # BIN_DIST
 else
 HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
-HSC2HS_DIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
+HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(CURRENT_DIR)
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
 endif
 
-HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
+HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(INCLUDE_DIR)"
 endif
 
 $(SCRIPT_PROG) : Makefile