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

use full path name to generate library filename

Browse source 
avoids overlaps
This commit is contained in:
Joey Hess 2012-12-09 13:17:55 -04:00
parent 4bb8fdb70d
commit ecc49d7db8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Build/OSXMkLibs.hs
View file

@ -15,6 +15,7 @@ import System.Directory
import System.IO import System.IO
import Control.Monad import Control.Monad
import Data.List import Data.List
import Data.String.Utils
import Utility.PartialPrelude import Utility.PartialPrelude
import Utility.Directory import Utility.Directory
@ -41,7 +42,8 @@ installLibs appbase libmap = do
(needlibs, libmap') <- otool appbase libmap (needlibs, libmap') <- otool appbase libmap
libs <- forM needlibs $ \lib -> do libs <- forM needlibs $ \lib -> do
let shortlib = fromMaybe (error "internal") (M.lookup lib libmap') let shortlib = fromMaybe (error "internal") (M.lookup lib libmap')
let dest = appbase </> takeFileName lib let fulllib = replace "/" "_" lib
let dest = appbase </> fulllib
let symdest = appbase </> shortlib let symdest = appbase </> shortlib
ifM (doesFileExist dest) ifM (doesFileExist dest)
( return Nothing ( return Nothing
@ -50,7 +52,7 @@ installLibs appbase libmap = do
putStrLn $ "installing " ++ lib ++ " as " ++ shortlib putStrLn $ "installing " ++ lib ++ " as " ++ shortlib
_ <- boolSystem "cp" [File lib, File dest] _ <- boolSystem "cp" [File lib, File dest]
_ <- boolSystem "chmod" [Param "644", File dest] _ <- boolSystem "chmod" [Param "644", File dest]
_ <- boolSystem "ln" [Param "-s", File (takeFileName lib), File symdest] _ <- boolSystem "ln" [Param "-s", File fulllib, File symdest]
return $ Just appbase return $ Just appbase
) )
return (catMaybes libs, libmap') return (catMaybes libs, libmap')