summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-29 12:23:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-29 12:23:38 -0400
commit7147b7b8b2a2bdb89e7c4f273f5f52b472c65105 (patch)
tree741f9d3b60a8cc81ff2e74674a5e8dc6502f5caa
parent6cdcae9e9acbc58feea5bf129b8f61e02f6f5940 (diff)
bring back GIT_ANNEX_LOCAL_FEATURES, I'm using it locally
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 20138713e..10fdd76b1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil
# you can turn off some of these features.
#
# If you're using an old version of yesod, enable -DWITH_OLD_YESOD
-FEATURES?=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING
+FEATURES?=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING
bins=git-annex
mans=git-annex.1 git-annex-shell.1