summaryrefslogtreecommitdiff
path: root/src/Propellor/Bootstrap.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-20 13:28:53 -0400
committerJoey Hess2016-03-20 13:28:53 -0400
commit394d44880ede6dd7fb916f21ca4fe24d9b3549c6 (patch)
treeae41ec177598827b743449a461a8fd20b27ce174 /src/Propellor/Bootstrap.hs
parent8e27dce708f9af48712dfa26274715ce22cb40e0 (diff)
parent80109620f6af779a2c58bc5766fb77301729f60f (diff)
Merge branch 'master' into typed-os-requirements
Diffstat (limited to 'src/Propellor/Bootstrap.hs')
-rw-r--r--src/Propellor/Bootstrap.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 11e59e6f..69eee66c 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -34,7 +34,7 @@ checkBinaryCommand = "if test -x ./propellor && ! ./propellor --check; then " ++
buildCommand :: ShellCommand
buildCommand = intercalate " && "
[ "cabal configure"
- , "cabal build"
+ , "cabal build propellor-config"
, "ln -sf dist/build/propellor-config/propellor-config propellor"
]
@@ -141,7 +141,7 @@ build :: IO Bool
build = catchBoolIO $ do
make "dist/setup-config" ["propellor.cabal"] $
cabal ["configure"]
- unlessM (cabal ["build"]) $ do
+ unlessM (cabal ["build", "propellor-config"]) $ do
void $ cabal ["configure"]
unlessM (cabal ["build"]) $
error "cabal build failed"