X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=bd421bd799cc726ff1fa868b5cfc332135691e48;hb=f12d4af480bc8fea6a44777199c9a32f60f444b9;hp=ad841b258e4eaa14340147beabd7e4292926d862;hpb=a4cb9b55d85b08480fd1d149db1aa4a9d46dcb40;p=ghc-hetmet.git

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index ad841b2..bd421bd 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -54,10 +54,6 @@ import Maybes		( expectJust, MaybeErr(..) )
 import Panic
 import Outputable
 
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 603
-import Compat.Directory	( getAppUserDataDirectory )
-#endif
-
 import System.Environment ( getEnv )
 import Distribution.InstalledPackageInfo
 import Distribution.Package
@@ -264,7 +260,10 @@ mungePackagePaths top_dir ps = map munge_pkg ps
   munge_pkg p = p{ importDirs  = munge_paths (importDirs p),
 		   includeDirs = munge_paths (includeDirs p),
     		   libraryDirs = munge_paths (libraryDirs p),
-		   frameworkDirs = munge_paths (frameworkDirs p) }
+		   frameworkDirs = munge_paths (frameworkDirs p),
+                   haddockInterfaces = munge_paths (haddockInterfaces p),
+	           haddockHTMLs = munge_paths (haddockHTMLs p)
+                    }
 
   munge_paths = map munge_path
 
@@ -381,10 +380,12 @@ findWiredInPackages dflags pkgs preload this_package = do
   -- their canonical names (eg. base-1.0 ==> base).
   --
   let
-	wired_in_pkgids = [ basePackageId,
-			    rtsPackageId,
-			    haskell98PackageId,
-			    thPackageId,
+        wired_in_pkgids = [ primPackageId,
+                            integerPackageId,
+                            basePackageId,
+                            rtsPackageId,
+                            haskell98PackageId,
+                            thPackageId,
                             ndpPackageId ]
 
 	wired_in_names = map packageIdString wired_in_pkgids