Commit d05c7c0b authored by Maxim Koltsov's avatar Maxim Koltsov

Install to dynlibdir as well

parent ad76974a
......@@ -39,6 +39,7 @@ import Distribution.Simple.LocalBuildInfo (
......@@ -202,10 +203,16 @@ doInstall verbosity packageDesc localBuildInfo copyDest = do
startDir <- getCurrentDirectory
let cppSourceDir = startDir </> "cpp"
libDir = libdir $ absoluteInstallDirs packageDesc localBuildInfo copyDest
dynlibDir = dynlibdir $ absoluteInstallDirs packageDesc localBuildInfo copyDest
programDb = withPrograms localBuildInfo
-- Call the makefile to install the C++ shared library into the package's
-- libdir.
-- XXX maksbotan: I'm done with this. When compiling TH, GHC searches for libraries
-- in `dynlibdir`, but when configuring depending packages Cabal searches for libraries
-- only in `libdir`. Hacking it away right now with this duplication.
runDbProgram verbosity makeProgram programDb
["-C", cppSourceDir, "install", "INSTALL_ROOT=" ++ dynlibDir]
runDbProgram verbosity makeProgram programDb
["-C", cppSourceDir, "install", "INSTALL_ROOT=" ++ libDir]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment