git.iko.soy/typeable/pandoc
on master help sign in
Make copying of man pages respect --destdir.

Closes #2262.

commit608fc273df4d508bcbf94a34a5f29701bc46cb44 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 2 Jul 2015, 16:21 (11 years ago) parent5f0b875
1 file changed+11−12
Setup.hs+11−12
Setup.hs+11−12
@@ -32,12 +32,8 @@ main :: IO ()
3232main = defaultMainWithHooks $ simpleUserHooks {
3333 -- enable hsb2hs preprocessor for .hsb files
3434 hookedPreProcessors = [ppBlobSuffixHandler]
35− , postBuild = \args bf pkgdescr lbi ->
36− makeManPage args bf pkgdescr lbi
37−
38− , postCopy = \_ flags pkg lbi ->
39− installManpage pkg lbi (fromFlag $ copyVerbosity flags)
40− NoCopyDest
35+ , postBuild = makeManPage
36+ , postCopy = installManPage
4137 }
4238
4339ppBlobSuffixHandler :: PPSuffixHandler
@@ -53,8 +49,8 @@ ppBlobSuffixHandler = ("hsb", \_ _ ->
5349 return ()
5450 })
5551
56−makeManPage :: Args -> BuildFlags -> PackageDescription -> LocalBuildInfo
57− -> IO ()
52+makeManPage :: Args -> BuildFlags
53+ -> PackageDescription -> LocalBuildInfo -> IO ()
5854makeManPage _ bf _ LocalBuildInfo{buildDir=buildDir}
5955 = do notice verbosity "Creating man/pandoc.1"
6056 rawSystemExit verbosity progPath args
@@ -67,9 +63,12 @@ makeManPage _ bf _ LocalBuildInfo{buildDir=buildDir}
6763 "--filter", "man/removeLinks.hs",
6864 "-o", "man/pandoc.1"]
6965
70−installManpage :: PackageDescription -> LocalBuildInfo
71− -> Verbosity -> CopyDest -> IO ()
72−installManpage pkg lbi verbosity copy = do
73− let mandest = mandir (absoluteInstallDirs pkg lbi copy) </> "man1"
66+installManPage :: Args -> CopyFlags
67+ -> PackageDescription -> LocalBuildInfo -> IO ()
68+installManPage _ flags pkg lbi = do
69+ let verbosity = fromFlag (copyVerbosity flags)
70+ let copydest = fromFlag (copyDest flags)
71+ let mandest = mandir (absoluteInstallDirs pkg lbi copydest)
72+ </> "man1"
7473 notice verbosity $ "Copying man page to " ++ mandest
7574 installOrdinaryFiles verbosity mandest [("man", "pandoc.1")]