From 1f5d1aa62d561a76134371ac3c3e143a20115be9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Mar 2016 12:55:01 -0400 Subject: Fix OSX dmg to include libraries needed by bundled gpg, lost in last release. --- Build/OSXMkLibs.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Build') 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 ) -- cgit v1.2.3