diff options
author | David Waern <david.waern@gmail.com> | 2010-05-13 20:05:50 +0000 |
---|---|---|
committer | David Waern <david.waern@gmail.com> | 2010-05-13 20:05:50 +0000 |
commit | 94335867d636db9ad6c111705283ec10c9ee1167 (patch) | |
tree | 37352d4abe829bb848cf5a8cf538c135024d587e /src/Haddock/Backends/HH2.hs | |
parent | 9dc3aeef7388cb962a2d021d9e119c586fc18068 (diff) |
Get rid of H.Utils.pathJoin and use System.FilePath.joinPath instead
Diffstat (limited to 'src/Haddock/Backends/HH2.hs')
-rw-r--r-- | src/Haddock/Backends/HH2.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Haddock/Backends/HH2.hs b/src/Haddock/Backends/HH2.hs index 406ad87e..7a49bded 100644 --- a/src/Haddock/Backends/HH2.hs +++ b/src/Haddock/Backends/HH2.hs @@ -43,7 +43,7 @@ ppHH2Contents odir doctitle maybe_package tree = do nest 4 (ppModuleTree [] tree) $+$ text "</HelpTOCNode>") $$ text "</HelpTOC>" - writeFile (pathJoin [odir, contentsHH2File]) (render doc) + writeFile (joinPath [odir, contentsHH2File]) (render doc) where package = fromMaybe "pkg" maybe_package @@ -95,8 +95,8 @@ ppHH2Index odir maybe_package ifaces = do nest 4 (text "<Jump Url=\""<>text contentsHtmlFile<>text "\"/>") $$ text "</Keyword>" $$ text "</HelpIndex>" - writeFile (pathJoin [odir, indexKHH2File]) (render docK) - writeFile (pathJoin [odir, indexNHH2File]) (render docN) + writeFile (joinPath [odir, indexKHH2File]) (render docK) + writeFile (joinPath [odir, indexNHH2File]) (render docN) where package = fromMaybe "pkg" maybe_package @@ -132,7 +132,7 @@ ppHH2Files odir maybe_package ifaces pkg_paths = do ppIndexFiles chars $$ ppLibFiles ("":pkg_paths)) $$ text "</HelpFileList>" - writeFile (pathJoin [odir, filesHH2File]) (render doc) + writeFile (joinPath [odir, filesHH2File]) (render doc) where package = fromMaybe "pkg" maybe_package @@ -157,7 +157,7 @@ ppHH2Files odir maybe_package ifaces pkg_paths = do ppLibFiles paths where toPath fname | null path = fname - | otherwise = pathJoin [path, fname] + | otherwise = joinPath [path, fname] ppLibFile fname = text "<File Url=\""<>text (toPath fname)<>text "\"/>" chars :: [Char] @@ -192,5 +192,5 @@ ppHH2Collection odir doctitle maybe_package = do text "<ItemMoniker Name=\"!DefaultNamedUrlIndex\" ProgId=\"HxDs.HxIndex\" InitData=\"NamedURLIndex\"/>" $$ text "<ItemMoniker Name=\"!SampleInfo\" ProgId=\"HxDs.HxSampleCollection\" InitData=\"\"/>") $$ text "</HelpCollection>" - writeFile (pathJoin [odir, collectionHH2File]) (render doc) + writeFile (joinPath [odir, collectionHH2File]) (render doc) -} |