improve warning
This commit is contained in:
parent
e5323f4414
commit
0dbe93477c
1 changed files with 4 additions and 5 deletions
9
Setup.hs
9
Setup.hs
|
@ -65,11 +65,10 @@ installManpages copyDest verbosity pkg lbi =
|
||||||
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
|
installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
|
||||||
installDesktopFile copyDest _verbosity pkg lbi
|
installDesktopFile copyDest _verbosity pkg lbi
|
||||||
| progfile copyDest == progfile NoCopyDest =
|
| progfile copyDest == progfile NoCopyDest =
|
||||||
let dest = progfile copyDest
|
DesktopFile.installUser (progfile copyDest)
|
||||||
in DesktopFile.installUser dest
|
`catch` installerror
|
||||||
`catch` installerror dest
|
|
||||||
| otherwise = return ()
|
| otherwise = return ()
|
||||||
where
|
where
|
||||||
progfile cd = bindir (absoluteInstallDirs pkg lbi cd) </> "git-annex"
|
progfile cd = bindir (absoluteInstallDirs pkg lbi cd) </> "git-annex"
|
||||||
installerror :: FilePath -> SomeException -> IO ()
|
installerror :: SomeException -> IO ()
|
||||||
installerror dest e = putStrLn ("installation of desktop intrgration files in " ++ dest ++ " did not succeed (" ++ show e ++ "); skipping (set DESTDIR to install these files to a different location)")
|
installerror e = putStrLn ("Warning: Installation of desktop integration files did not succeed (" ++ show e ++ "); skipping.")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue