[project @ 2001-06-18 21:45:49 by sof]

[ghc-hetmet.git] / ghc / compiler / main / Finder.lhs

diff --git a/ghc/compiler/main/Finder.lhs b/ghc/compiler/main/Finder.lhs
index b208867..2fc393d 100644 (file)
--- a/ghc/compiler/main/Finder.lhs
+++ b/ghc/compiler/main/Finder.lhs
@@ -16,15 +16,11 @@ module Finder (
 #include "HsVersions.h"
 
 import HscTypes                ( ModuleLocation(..) )
-import CmStaticInfo
+import Packages                ( PackageConfig(..) )
 import DriverPhases
 import DriverState
-import DriverUtil
 import Module
-import FiniteMap
 import FastString
-import Util
-import Panic           ( panic )
 import Config
 
 import IOExts
@@ -160,7 +156,7 @@ maybePackageModule mod_name = do
   found <- findOnPackagePath pkgs hi
   case found of
        Nothing -> return Nothing
-       Just (pkg_name,path) -> 
+       Just (pkg_name,path) ->
            return (Just (mkModule mod_name pkg_name,
                          ModuleLocation{ 
                                 ml_hspp_file = Nothing,
@@ -178,8 +174,8 @@ findOnPackagePath pkgs file = loop pkgs
   loop (p:ps) = do
     found <- findOnPath (import_dirs p) file
     case found of
-       Nothing -> loop ps
-       Just f  -> return (Just (mkFastString (name p), f))
+       Nothing   -> loop ps
+       Just path -> return (Just (mkFastString (name p), path ++ '/':file))
 
 findOnPath :: [String] -> String -> IO (Maybe FilePath)
 findOnPath path s = loop path