X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compat%2FMakefile;h=4ae707e30e3153aa42c18899cc2316eb0e3f905d;hp=4dc05f8da464899d5b3e218ec3a23acde879da70;hb=0b9530245a33b8206ca38b9de6dfb01e056fd8dc;hpb=272d9683a9eabfd8e10f689b2a6cfb19b9071722

diff --git a/compat/Makefile b/compat/Makefile
index 4dc05f8..4ae707e 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -6,6 +6,7 @@ ALL_DIRS = \
 	Compat \
 	Distribution \
 	Distribution/Compat \
+	Distribution/Simple \
 	Language/Haskell \
 	System \
 	System/FilePath \
@@ -54,19 +55,19 @@ SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
 EXCLUDED_SRCS += System/FilePath/Internal.hs
 
 ifeq "$(ghc_ge_603)" "YES"
-# These modules are provided in GHC 6.3+
-EXCLUDED_SRCS += \
-	System/Directory/Internals.hs
-
-SRC_MKDEPENDHS_OPTS += \
-	-optdep--exclude-module=System.Directory.Internals
-
+ifneq "$(ghc_ge_607)" "YES"
 # GHC 6.3+ has Cabal, but we're replacing it:
 SRC_HC_OPTS += -ignore-package Cabal
 
 # only GHC 6.3+ has -ignore-package
 SRC_HC_OPTS += -ignore-package filepath
 endif
+endif
+
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package directory
+SRC_HC_OPTS += -package pretty
+endif
 
 # Some explicit dependencies, needed because ghc -M can't discover the
 # true dependencies of these stub files.