summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-26 19:21:22 +0000
committerGravatar Joey Hess <joey@kitenet.net>2013-11-26 19:21:22 +0000
commit8e430254e2e5705d3b18646b4615dee963355097 (patch)
treea0bedab94b2821f3cd8718a419a5c9ff73e4e615 /Makefile
parenta878c3e2dc956433d60e9cf03c149a52d038fcdf (diff)
avoid excesive cabal configure when rebuilding android
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9c2d2d380..533ceca25 100644
--- a/Makefile
+++ b/Makefile
@@ -192,7 +192,7 @@ android: Build/EvilSplicer
sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal
# Build just once, but link twice, for 2 different versions of Android.
mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3
- if [ ! -e tmp/androidtree/dist/setup/setup ]; then \
+ if [ ! -e tmp/androidtree/dist/setup-config ]; then \
cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \
fi
cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \