make configure -Wall clean

This commit is contained in:
Joey Hess 2014-03-10 16:59:38 -04:00
parent 1f1ac8b838
commit b04f62a962
4 changed files with 5 additions and 16 deletions

View file

@ -16,15 +16,14 @@ import System.Directory
import qualified Build.DesktopFile as DesktopFile
import qualified Build.Configure as Configure
main :: IO ()
main = defaultMainWithHooks simpleUserHooks
{ preConf = configure
{ preConf = \_ _ -> do
Configure.run Configure.tests
return (Nothing, [])
, postInst = myPostInst
}
configure _ _ = do
Configure.run Configure.tests
return (Nothing, [])
myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
myPostInst _ (InstallFlags { installVerbosity }) pkg lbi = do
installGitAnnexShell dest verbosity pkg lbi
@ -57,7 +56,7 @@ installManpages copyDest verbosity pkg lbi =
manpages = ["git-annex.1", "git-annex-shell.1"]
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installDesktopFile copyDest verbosity pkg lbi =
installDesktopFile copyDest _verbosity pkg lbi =
DesktopFile.install $ dstBinDir </> "git-annex"
where
dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest