summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-04 14:16:15 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-04 14:16:15 -0400
commit14750badab245c4e2a52276b00663f3cac47f10e (patch)
treefad9867d25b979dc67161e6e31af688421fa98de /Makefile
parent053a602b3de5453e6aeae1c96ee27b32c5b8c81b (diff)
only set ANDROID_FLAGS if not already set
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4e4523d2d..1c1742e17 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ osxapp: Build/Standalone Build/OSXMkLibs
rm -f tmp/git-annex.dmg.bz2
bzip2 --fast tmp/git-annex.dmg
-ANDROID_FLAGS=
+ANDROID_FLAGS?=
# Cross compile for Android.
# Uses https://github.com/neurocyte/ghc-android
android: Build/EvilSplicer