summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-03-08 16:59:36 -0400
committerJoey Hess2017-03-08 16:59:50 -0400
commit678a4873fab24addce1c4f264ce303b85b08550c (patch)
tree9f98b3bb12880d260a33fdaf6af486a3832e0420
parent8b973f3acaf3075b836973d0e0d5d26ac6b0d362 (diff)
Makefile: Removed "run" target which was default target.
"make" now only builds propellor, does not run it. 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. (Debian has 0.9.1 in stable, and 3.2.3 will be in the next stable release. Upgrading between Debian releases is supposed to be done without skipping a release, so that's ok.)
-rw-r--r--Makefile5
-rw-r--r--debian/changelog5
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4ae11991..84a92f0e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,6 @@
CABAL?=cabal
DATE := $(shell dpkg-parsechangelog 2>/dev/null | grep Date | cut -d " " -f2-)
-# this target is provided (and is first) to keep old versions of the
-# propellor cron job working, and will eventually be removed
-run: build
- ./propellor
-
build: tags propellor.1 dist/setup-config
$(CABAL) build
ln -sf dist/build/propellor-config/propellor-config propellor
diff --git a/debian/changelog b/debian/changelog
index 9f0d46b0..f7cbcca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
propellor (3.4.2) UNRELEASED; urgency=medium
* Added Apache.confEnabled.
+ * Makefile: Removed "run" target which was default target.
+ "make" now only builds propellor, does not run it.
+ 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.
-- Joey Hess <id@joeyh.name> Wed, 08 Mar 2017 14:02:10 -0400