diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-04 14:25:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-04 14:25:24 -0400 |
| commit | 18a447fe97721eb0906a5c9e9613d39702d6c825 (patch) | |
| tree | bd6b6777e3a8567a34250bedf856a562afc2725d /Makefile | |
| parent | 14750badab245c4e2a52276b00663f3cac47f10e (diff) | |
android build fix
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -181,11 +181,9 @@ android: Build/EvilSplicer # Cabal cannot cross compile with custom build type, so workaround. sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal if [ ! -e tmp/androidtree/dist/setup/setup ]; then \ - cd tmp/androidtree; \ - cabal configure; \ - $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f"Android $(ANDROID_FLAGS)"; \ + cd tmp/androidtree && $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f"Android $(ANDROID_FLAGS)"; \ fi - $(MAKE) -C tmp/androidtree git-annex + cd tmp/androidtree && $(CABAL) build adb: ANDROID_FLAGS="-Production" $(MAKE) android |