diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-07 12:55:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-07 12:55:01 -0400 |
| commit | 1f5d1aa62d561a76134371ac3c3e143a20115be9 (patch) | |
| tree | 92f652bf233f3a2c05c68c7918f49e6076645a38 /Build | |
| parent | 9323cf08529894b5e5030fb6f51b90f97cc33d48 (diff) | |
Fix OSX dmg to include libraries needed by bundled gpg, lost in last release.
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/OSXMkLibs.hs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs index 80f24a681..c23f4a321 100644 --- a/Build/OSXMkLibs.hs +++ b/Build/OSXMkLibs.hs @@ -49,6 +49,10 @@ installLibs appbase replacement_libs libmap = do let fulllib = dropWhile (== '/') lib let dest = appbase </> fulllib let symdest = appbase </> shortlib + -- This is a hack; libraries need to be in the same + -- directory as the program, so also link them into the + -- extra directory. + let symdestextra = appbase </> "extra" </> shortlib ifM (doesFileExist dest) ( return Nothing , do @@ -56,7 +60,8 @@ installLibs appbase replacement_libs libmap = do putStrLn $ "installing " ++ pathlib ++ " as " ++ shortlib unlessM (boolSystem "cp" [File pathlib, File dest] <&&> boolSystem "chmod" [Param "644", File dest] - <&&> boolSystem "ln" [Param "-s", File fulllib, File symdest]) $ + <&&> boolSystem "ln" [Param "-s", File fulllib, File symdest] + <&&> boolSystem "ln" [Param "-s", File (".." </> fulllib), File symdestextra]) $ error "library install failed" return $ Just appbase ) |