aboutsummaryrefslogtreecommitdiff
path: root/Distribution
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2015-08-12 06:58:32 +0200
committerDaniel Gröber <dxld@darkboxed.org>2015-08-12 06:58:32 +0200
commite6ff6a7f5615294aa90b7f3ae6a2a8111a8e1540 (patch)
tree674cf95ba561f22a63cbfc499d53a331c370b70e /Distribution
parent58d6a5bbab4858ec3906074e8badd6b4f47b8e7f (diff)
Fix tests
Diffstat (limited to 'Distribution')
-rw-r--r--Distribution/Helper.hs10
1 files changed, 7 insertions, 3 deletions
diff --git a/Distribution/Helper.hs b/Distribution/Helper.hs
index da07510..3544d2e 100644
--- a/Distribution/Helper.hs
+++ b/Distribution/Helper.hs
@@ -265,11 +265,15 @@ getSomeConfigState = ask >>= \(QueryEnv readProc progs projdir distdir) -> do
-- in the usual place.
writeAutogenFiles :: MonadIO m
=> (FilePath -> [String] -> String -> IO String)
- -> FilePath -- ^ Path to the @dist/@ directory
+ -> FilePath
+ -- ^ Path to project directory, i.e. the one containing the
+ -- @project.cabal@ file
+ -> FilePath
+ -- ^ Path to the @dist/@ directory
-> m ()
-writeAutogenFiles readProc distdir = liftIO $ do
+writeAutogenFiles readProc projdir distdir = liftIO $ do
exe <- findLibexecExe "cabal-helper-wrapper"
- void $ readProc exe ["/nowhere/../..", distdir, "write-autogen-files"] ""
+ void $ readProc exe [projdir, distdir, "write-autogen-files"] ""
-- | Get the path to the sandbox package-db in a project
getSandboxPkgDb :: (FilePath -> [String] -> String -> IO String)