summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-07 12:24:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-07 12:24:12 -0400
commit415f0dd5d8dbbb69e6210523aac580fab7693f76 (patch)
tree8219048e5863fd54e1ed5e1bfe3352cd60ccb252 /Makefile
parent8925d975a9d5c86291d50762418c348b8c7725cc (diff)
don't clobber env variable if set
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 21cb41480..6c0ea67b4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
CFLAGS=-Wall
-GIT_ANNEX_TMP_BUILD_DIR=tmp
+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