diff options
| -rw-r--r-- | Build/OSXMkLibs.hs | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 8 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 ) diff --git a/debian/changelog b/debian/changelog index 671ce9504..fe8d0cb1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ git-annex (6.20160230) UNRELEASED; urgency=medium * Added dependencies on haskell mountpoints and disk-free-space libraries, removing FFI code from git-annex. * dropkey: Add --batch and --json. + * Fix OSX dmg to include libraries needed by bundled gpg, + lost in last release. -- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400 |