summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-28 15:57:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-28 15:59:06 -0400
commit806b699ce5cc5761b35392cb034620f3d97f7bee (patch)
tree5b546cad8d65460addea491b472e293f36eca901 /Makefile
parentb6286bdabff4b5e3845783abbd99ad7aa749a31e (diff)
The Makefile now builds with the new yesod by default.
Systems like Debian that have the old yesod 1.0.1 should set GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3d3431493..649fb59e9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil
# If you get build failures due to missing haskell libraries,
# you can turn off some of these features.
-FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD -DWITH_PAIRING
+#
+# If you're using an old version of yesod, enable -DWITH_OLD_YESOD
+FEATURES=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING
bins=git-annex
mans=git-annex.1 git-annex-shell.1