diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-15 19:36:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-15 19:38:21 -0400 |
| commit | 0646eacf36a7851b05008b93260a1bb7df3548e9 (patch) | |
| tree | cc6fec0075b7d0a5f43a12db745a209680ecac9b /Makefile | |
| parent | 6b79d1ecdc95093baaa841e0880788fbc44bd3fc (diff) | |
android build fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -173,14 +173,13 @@ android: Build/EvilSplicer # used to have TH splices but they were removed, it will be newer, # and not overwritten.) cp -uR tmp/splices/* tmp/androidtree - cd tmp/androidtree && $(MAKE) git-annex # Some additional dependencies needed by the expanded splices. sed -i 's/^ Build-Depends: / Build-Depends: yesod-core, shakespeare-js, shakespeare, blaze-markup, /' tmp/androidtree/git-annex.cabal # 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 \ + cabal configure; \ $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing'; \ fi $(MAKE) -C tmp/androidtree git-annex |