From cf03cd7783bb1a5947ff84ec239dc9524f5ce821 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Mon, 29 Feb 2016 09:37:36 -0500 Subject: [PATCH] Bind variables for the icu dirs. --- Setup.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Setup.hs b/Setup.hs index 2a2c9b4fa..453df56a1 100644 --- a/Setup.hs +++ b/Setup.hs @@ -16,12 +16,14 @@ conf x flags = do libraryBuildInfo = P.libBuildInfo library relativeIncludeDirs = [ "common", "i18n" ] in do dir <- getCurrentDirectory + let icuLibDir = dir ++ "/vendor/icu/lib" + let icuSourceDir = dir ++ "/vendor/icu/source/" return localBuildInfo { localPkgDescr = packageDescription { P.library = Just $ library { P.libBuildInfo = libraryBuildInfo { - P.extraLibDirs = (dir ++ "/vendor/icu/lib") : P.extraLibDirs libraryBuildInfo, - P.includeDirs = (((dir ++ "/vendor/icu/source/") ++) <$> relativeIncludeDirs) ++ P.includeDirs libraryBuildInfo + P.extraLibDirs = icuLibDir : P.extraLibDirs libraryBuildInfo, + P.includeDirs = ((icuSourceDir ++) <$> relativeIncludeDirs) ++ P.includeDirs libraryBuildInfo } } }