From e26c232d154eb1a6b6eca631414ed7526993f88c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Feb 2015 12:50:28 -0400 Subject: avoid using the makefile when bootstrapping with --spin --- Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d706d8ef..acd70a5f 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,12 @@ CABAL?=cabal -DEBDEPS=gnupg ghc cabal-install libghc-missingh-dev libghc-ansi-terminal-dev libghc-ifelse-dev libghc-unix-compat-dev libghc-hslogger-dev libghc-network-dev libghc-quickcheck2-dev libghc-mtl-dev libghc-monadcatchio-transformers-dev - -# this target is provided to keep old versions of the propellor cron job -# working, and will eventually be removed -run: deps build +# 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 dev: build tags -deps: - @if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install $(DEBDEPS) || (apt-get update && apt-get --no-upgrade --no-install-recommends -y install $(DEBDEPS)); fi || true - @if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install libghc-async-dev || (cabal update; cabal install async); fi || true - install: propellor.1 install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor @@ -50,7 +44,8 @@ hackage: .PHONY: tags # The rules below are only used when bootstrapping new propellor -# installations; propellor contains equivilant haksell code. +# installations and building packages; propellor contains equivilant +# haskell code that it uses to re-build itself. build: dist/setup-config @if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi -- cgit v1.2.3