summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2016-03-09 11:04:59 -0400
committerJoey Hess2016-03-09 11:04:59 -0400
commit05911e0db9369b99db2054dfbbfe9eb9a7236530 (patch)
treec240584e4887f5d3f01d6c1691130885d52ae019 /src
parent29c6dcda77ee8348f7c8b292d61d363a6d699e26 (diff)
parentf045116b618e255c583376447be635c245d63909 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
-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"