X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=bdb8cf724a522d69c2fd0c2a00f2a3f2f53e8f78;hp=505a797c72bff94a73837c398015f9bc8a34578d;hb=46bef1c09f499c5b34a00b650614bebfa1d6ba4b;hpb=3e39f8485ee4bd1ef6e3e7153ea88e45bfa9218e diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 505a797..bdb8cf7 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -265,8 +265,8 @@ mungePackagePaths top_dir ps = map munge_pkg ps munge_paths = map munge_path munge_path p - | Just p' <- maybePrefixMatch "$topdir" p = top_dir ++ p' - | Just p' <- maybePrefixMatch "$httptopdir" p = toHttpPath top_dir ++ p' + | Just p' <- stripPrefix "$topdir" p = top_dir ++ p' + | Just p' <- stripPrefix "$httptopdir" p = toHttpPath top_dir ++ p' | otherwise = p toHttpPath p = "file:///" ++ p