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

squash warning in OSX build

Browse source
This commit is contained in:
Joey Hess 2013-12-15 17:10:24 -04:00
parent f119c625bb
commit 0bc4a78db5
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Install.hs
View file

@ -11,7 +11,6 @@ module Assistant.Install where
import Assistant.Common import Assistant.Common
import Assistant.Install.AutoStart import Assistant.Install.AutoStart
import Assistant.Install.Menu
import Assistant.Ssh import Assistant.Ssh
import Config.Files import Config.Files
import Utility.FileMode import Utility.FileMode
@ -23,6 +22,7 @@ import Utility.Env
import Utility.OSX import Utility.OSX
#else #else
import Utility.FreeDesktop import Utility.FreeDesktop
import Assistant.Install.Menu
#endif #endif
standaloneAppBase :: IO (Maybe FilePath) standaloneAppBase :: IO (Maybe FilePath)

4
Assistant/Install/Menu.hs
View file

@ -14,10 +14,10 @@ import Common
import Utility.FreeDesktop import Utility.FreeDesktop
installMenu :: FilePath -> FilePath -> FilePath -> FilePath -> IO () installMenu :: FilePath -> FilePath -> FilePath -> FilePath -> IO ()
installMenu command menufile iconsrcdir icondir = do
#ifdef darwin_HOST_OS #ifdef darwin_HOST_OS
return () installMenu _command _menufile _iconsrcdir _icondir = return ()
#else #else
installMenu command menufile iconsrcdir icondir = do
writeDesktopMenuFile (fdoDesktopMenu command) menufile writeDesktopMenuFile (fdoDesktopMenu command) menufile
installIcon (iconsrcdir </> "logo.svg") $ installIcon (iconsrcdir </> "logo.svg") $
iconFilePath (iconBaseName ++ ".svg") "scalable" icondir iconFilePath (iconBaseName ++ ".svg") "scalable" icondir