diff options
Diffstat (limited to 'devel/hs-git-annex/files/patch-Build__DesktopFile.hs')
| -rw-r--r-- | devel/hs-git-annex/files/patch-Build__DesktopFile.hs | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs index 8dfb7d3275fd..5a5352bc2d4a 100644 --- a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs +++ b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs @@ -1,20 +1,30 @@ ---- ./Build/DesktopFile.hs.orig 2013-05-03 05:20:19.000000000 +0200 -+++ ./Build/DesktopFile.hs 2013-05-09 22:23:06.000000000 +0200 -@@ -42,11 +42,15 @@ +--- ./Build/DesktopFile.hs.orig 2014-07-09 22:09:05.000000000 +0200 ++++ ./Build/DesktopFile.hs 2014-07-13 01:40:51.000000000 +0200 +@@ -25,6 +25,7 @@ + #ifndef mingw32_HOST_OS + import System.Posix.User + #endif ++import System.FilePath.Posix + import Data.Maybe - writeFDODesktop :: FilePath -> IO () + systemwideInstall :: IO Bool +@@ -48,12 +49,17 @@ writeFDODesktop command = do -- datadir <- ifM systemwideInstall ( return systemDataDir, userDataDir ) + systemwide <- systemwideInstall + +- datadir <- if systemwide then return systemDataDir else userDataDir + prefix <- catchMaybeIO (getEnv "PREFIX") + let (sddir,scdir) = case prefix of -+ Just p -> (p </> "share", p </> "etc/xdg") -+ Nothing -> (systemDataDir, systemConfigDir) -+ datadir <- ifM systemwideInstall ( return sddir, userDataDir ) - installMenu command - =<< inDestDir (desktopMenuFilePath "git-annex" datadir) ++ Just p -> (p </> "share", p </> "etc/xdg") ++ Nothing -> (systemDataDir, systemConfigDir) ++ ++ datadir <- if systemwide then return sddir else userDataDir + menufile <- inDestDir (desktopMenuFilePath "git-annex" datadir) + icondir <- inDestDir (iconDir datadir) + installMenu command menufile "doc" icondir -- configdir <- ifM systemwideInstall ( return systemConfigDir, userConfigDir ) -+ configdir <- ifM systemwideInstall ( return scdir, userConfigDir ) +- configdir <- if systemwide then return systemConfigDir else userConfigDir ++ configdir <- if systemwide then return scdir else userConfigDir installAutoStart command =<< inDestDir (autoStartPath "git-annex" configdir) |