@@ -48,7 +48,9 @@ runTestSuite _ _ pkg _ = do
4848
4949-- | Build man pages from markdown sources in man/man1/.
5050makeManPages :: Args -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()
51−makeManPages _ flags _ _ = mapM_ (makeManPage (fromFlag $ buildVerbosity flags)) manpages
51+makeManPages _ flags _ buildInfo =
52+ mapM_ (makeManPage pandocPath (fromFlag $ buildVerbosity flags)) manpages
53+ where pandocPath = (buildDir buildInfo) </> "pandoc" </> "pandoc"
5254
5355manpages :: [FilePath]
5456manpages = ["pandoc.1", "markdown2pdf.1"]
@@ -57,21 +59,20 @@ manDir :: FilePath
5759manDir = "man" </> "man1"
5860
5961-- | Build a man page from markdown source in man/man1.
60−makeManPage :: Verbosity -> FilePath -> IO ()
61−makeManPage verbosity manpage = do
62− let pandoc = "dist" </> "build" </> "pandoc" </> "pandoc"
62+makeManPage :: FilePath -> Verbosity -> FilePath -> IO ()
63+makeManPage pandoc verbosity manpage = do
6364 let page = manDir </> manpage
64− let source = manDir </> manpage <.> "md"
65+ let source = page <.> "md"
6566 modifiedDeps <- modifiedDependencies page [source]
6667 unless (null modifiedDeps) $ do
6768 ec <- runProcess pandoc ["-s", "-S", "-r", "markdown", "-w", "man",
6869 "--template=templates/man.template", "-o", page, source]
6970 Nothing Nothing Nothing Nothing (Just stderr) >>= waitForProcess
7071 case ec of
71− ExitSuccess -> unless (verbosity == silent) $
72− putStrLn $ "Created " ++ manDir </> manpage
73− _ -> do putStrLn $ "Error creating " ++ manDir </> manpage
74− exitWith ec
72+ ExitSuccess -> unless (verbosity == silent) $
73+ putStrLn $ "Created " ++ page
74+ ExitFailure n -> putStrLn ("Error creating " ++ page ++
75+ ". Exit code = " ++ show n) >> exitWith ec
7576
7677installScripts :: PackageDescription -> LocalBuildInfo
7778 -> Verbosity -> CopyDest -> IO ()