summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-09 13:33:04 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-09 13:33:04 -0400
commitbe310ac4d0d0c0343c8a7d54f9137ee1946bfd1c (patch)
treefc0079d720e64142441a6db87a27235edca7e333 /Makefile
parent20203b45b9dbf915851969b9c5f4c9cb6e71acb6 (diff)
support building with yesod-default 1.1.0
Old 1.0.1 version is still supported as well. Cabal autodetects which version is available, but in the Makefile, WITH_OLD_YESOD has to be configured appropriately. I have not squashed all the $newline warnings with the new Yesod. They should go away eventually anyway as Yesod moves past that transition.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 89deedd65..3dcae1364 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CFLAGS=-Wall
GIT_ANNEX_TMP_BUILD_DIR?=tmp
IGNORE=-ignore-package monads-fd -ignore-package monads-tf
BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtility
-FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP
+FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD
bins=git-annex
mans=git-annex.1 git-annex-shell.1