on master help sign in
Merge pull request #2494 from uwap/master

Make --mkdoc follow the sourcedir

commita8f3171d56d22572901915e1d8784163002f52a9 authorNiklas Larsson <metaniklas@gmail.com> dateSun 2 Aug 2015, 13:58 (11 years ago) parent7095d6c61f02bf
1 file changed+3−3
src/Pkg/Package.hs+3−3
src/Pkg/Package.hs+3−3
@@ -132,17 +132,17 @@ documentPkg fp =
132132 do pkgdesc <- parseDesc fp
133133 cd <- getCurrentDirectory
134134 let pkgDir = cd </> takeDirectory fp
135− outputDir = cd </> (pkgname pkgdesc) ++ "_doc"
135+ outputDir = cd </> pkgname pkgdesc ++ "_doc"
136136 opts = NoREPL : Verbose : idris_opts pkgdesc
137137 mods = modules pkgdesc
138138 fs = map (foldl1' (</>) . splitOn "." . showCG) mods
139139 setCurrentDirectory $ pkgDir </> sourcedir pkgdesc
140140 make (makefile pkgdesc)
141− setCurrentDirectory $ pkgDir
141+ setCurrentDirectory pkgDir
142142 let run l = runExceptT . execStateT l
143143 load [] = return ()
144144 load (f:fs) = do loadModule f; load fs
145− loader = do idrisMain opts; load fs
145+ loader = do idrisMain opts; addImportDir (sourcedir pkgdesc); load fs
146146 idrisInstance <- run loader idrisInit
147147 setCurrentDirectory cd
148148 case idrisInstance of