summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2020-06-18 11:30:49 -0400
committerJoey Hess2020-06-18 11:30:49 -0400
commitc4059b606f65185cf8d4a20e4badc099a63b569e (patch)
tree03286f01901a934d93f5251e4d59a98152a7d3e1
parent5e20033605001ea6e3d8e7250cae3e9be34fffbe (diff)
parenta2b47d3a3c8d64ccf7b1444a4608b88bd470aff6 (diff)
Merge branch 'joeyconfig'
-rw-r--r--Makefile2
-rw-r--r--src/Propellor/Bootstrap.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b5d5708b..8f0414fe 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DATE := $(shell dpkg-parsechangelog 2>/dev/null | grep Date | cut -d " " -f2-)
build: tags propellor.1 configured
$(CABAL) build
@if [ -d dist-newstyle ]; then \
- ln -sf $$(find dist-newstyle/ -executable -type f | grep 'build/propellor-config/propellor-config$$') propellor; \
+ ln -sf $$(find dist-newstyle/ -executable -type f | grep 'build/propellor-config/propellor-config$$' | tail -n1) propellor; \
else \
ln -sf dist/build/propellor-config/propellor-config propellor; \
fi
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 0fef92f1..84a26ee3 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -83,7 +83,7 @@ buildCommand bs = intercalate " && " (go (getBuilder bs))
, "cabal build -j1 propellor-config"
, intercalate "; "
[ "if [ -d dist-newstyle ]"
- , "then ln -sf $(find dist-newstyle/ -executable -type f | grep 'build/propellor-config/propellor-config$') propellor"
+ , "then ln -sf $(find dist-newstyle/ -executable -type f | grep 'build/propellor-config/propellor-config$' | tail -n1) propellor"
, "else ln -sf dist/build/propellor-config/propellor-config propellor"
, "fi"
]