summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
-rw-r--r--src/Propellor/Bootstrap.hs3
3 files changed, 2 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index f7cbcca2..7fc68fe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ propellor (3.4.2) UNRELEASED; urgency=medium
Note that propellor 1.0.0 and earlier relied on this target for
the Cron.runPropellor property's cronjob to work, so upgrading
directly to this version from 1.0.0 would break that cron job.
+ * Remove make from propellor's dependency list; it's not used by
+ propellor any longer.
-- Joey Hess <id@joeyh.name> Wed, 08 Mar 2017 14:02:10 -0400
diff --git a/debian/control b/debian/control
index 9194b6c2..289e663b 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
libghc-text-dev,
libghc-concurrent-output-dev,
git,
- make,
Description: property-based host configuration management in haskell
Propellor ensures 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 045e5256..9d2d603d 100644
--- a/src/Propellor/Bootstrap.hs
+++ b/src/Propellor/Bootstrap.hs
@@ -94,7 +94,6 @@ depsCommand msys = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall])
, "libghc-exceptions-dev"
, "libghc-stm-dev"
, "libghc-text-dev"
- , "make"
]
fbsddeps =
[ "gnupg"
@@ -112,7 +111,6 @@ depsCommand msys = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall])
, "hs-exceptions"
, "hs-stm"
, "hs-text"
- , "gmake"
]
archlinuxdeps =
[ "gnupg"
@@ -131,7 +129,6 @@ depsCommand msys = "( " ++ intercalate " ; " (concat [osinstall, cabalinstall])
, "haskell-exceptions"
, "haskell-stm"
, "haskell-text"
- , "make"
]
installGitCommand :: Maybe System -> ShellCommand