[project @ 2005-01-26 15:04:08 by simonmar]

Remove System.FilePath, use System.Directory.Internals for now.

ghc/compiler/Makefile

@@ -527,7 +527,7 @@ SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=Distribution.ParseUtils \
 	-optdep--exclude-module=Distribution.Setup \
 	-optdep--exclude-module=Distribution.Version \
-	-optdep--exclude-module=System.FilePath
+	-optdep--exclude-module=System.Directory.Internals
 endif
 
 SRC_LD_OPTS += -no-link-chk

ghc/lib/compat/Compat/Directory.hs

@@ -26,7 +26,7 @@ module Compat.Directory (
 #endif
 
 import System.Environment (getEnv)
-import System.FilePath
+import System.Directory.Internals
 #if __GLASGOW_HASKELL__ > 600
 import Control.Exception	( bracket )
 import Control.Monad		( when )

ghc/lib/compat/Makefile

@@ -21,7 +21,7 @@ ghc_603_plus = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else
 ifeq "$(ghc_603_plus)" "YES"
 # These modules are all provided in GHC 6.3+
 EXCLUDED_SRCS += \
-	System/FilePath.hs \
+	System/Directory/Internals.hs \
 	Distribution/Compat/ReadP.hs \
 	Distribution/Extension.hs \
 	Distribution/GetOpt.hs \
@@ -34,7 +34,7 @@ EXCLUDED_SRCS += \
 endif
 
 # Some explicit dependencies
-System/FilePath.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/FilePath.hs
+System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/Directory/Internals.hs
 Distribution/Compat/ReadP.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/ReadP.hs
 Distribution/Extension.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Extension.hs
 Distribution/GetOpt.$(way_)o    : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs

ghc/lib/compat/System/FilePath.hs → ghc/lib/compat/System/Directory/Internals.hs

 {-# OPTIONS -cpp #-}
-#include "base/System/FilePath.hs"
-
+#include "base/System/Directory/Internals.hs"
 -- dummy comment

ghc/utils/ghc-pkg/Makefile

@@ -56,7 +56,7 @@ SRC_MKDEPENDHS_OPTS += \
 	-optdep--exclude-module=Distribution.ParseUtils \
 	-optdep--exclude-module=Distribution.Setup \
 	-optdep--exclude-module=Distribution.Version \
-	-optdep--exclude-module=System.FilePath
+	-optdep--exclude-module=System.Directory.Internals
 
 # -----------------------------------------------------------------------------=
 # Create the Version.hs file