mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Improve Setup.hs file so that cabal copy --destdir works. Thanks, Magnus_Therning.

Browse source
This commit is contained in:
Joey Hess 2015-08-09 10:30:35 -04:00
parent b0bc141a97
commit 8167f6fb40
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Setup.hs
View file

@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks
}
myPostCopy :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO ()
myPostCopy _ (CopyFlags { copyVerbosity }) pkg lbi = do
myPostCopy _ flags pkg lbi = do
installGitAnnexShell dest verbosity pkg lbi
installManpages dest verbosity pkg lbi
installDesktopFile dest verbosity pkg lbi
where
dest = NoCopyDest
verbosity = fromFlag copyVerbosity
dest = fromFlag $ copyDest flags
verbosity = fromFlag $ copyVerbosity flags
installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installGitAnnexShell copyDest verbosity pkg lbi =
@ -62,7 +62,9 @@ installManpages copyDest verbosity pkg lbi =
srcManDir = "man"
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installDesktopFile copyDest _verbosity pkg lbi =
DesktopFile.install $ dstBinDir </> "git-annex"
installDesktopFile copyDest _verbosity pkg lbi
| progfile copyDest == progfile NoCopyDest =
DesktopFile.install (progfile copyDest)
| otherwise = return ()
where
dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
progfile cd = bindir (absoluteInstallDirs pkg lbi cd) </> "git-annex"