summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
-rw-r--r--src/Propellor/Bootstrap.hs1
3 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2decb1f0..86b1139f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+propellor (2.7.1) UNRELEASED; urgency=medium
+
+ * Make sure that make is installed when bootstrapping propellor.
+
+ -- Joey Hess <id@joeyh.name> Wed, 12 Aug 2015 19:19:28 -0400
+
propellor (2.7.0) unstable; urgency=medium
* Ssh.permitRootLogin type changed to allow configuring WithoutPassword
diff --git a/debian/control b/debian/control
index 51107783..25c3d474 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-transformers-dev,
libghc-exceptions-dev (>= 0.6),
git,
+ make,
Description: property-based host configuration management in haskell
Propellor enures that the system it's run in satisfies a list of
properties, taking action as necessary when a property is not yet met.
diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs
index 1cf921cf..6812b4ab 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -81,6 +81,7 @@ depsCommand = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall]) ++ "
, "libghc-mtl-dev"
, "libghc-transformers-dev"
, "libghc-exceptions-dev"
+ , "make"
]
installGitCommand :: ShellCommand