summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-02 11:18:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-02 11:18:01 -0400
commit8b2d884465c21e0f91aaec1658fe93fb885653f2 (patch)
treef1ac7b5c4858871d6ad5c8edd9115b6fca7789b4 /Makefile
parent992ad671c512c777abf2280c369c8e53c5f68c60 (diff)
don't fail android build if there are no splices
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ec0891504..4800d72a9 100644
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,7 @@ android: Build/EvilSplicer
# only if the existing source file is not newer. (So, if a file
# used to have TH splices but they were removed, it will be newer,
# and not overwritten.)
- cp -uR tmp/splices/* tmp/androidtree
+ cp -uR tmp/splices/* tmp/androidtree || true
# Some additional dependencies needed by the expanded splices.
sed -i 's/^ Build-Depends: / Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, /' tmp/androidtree/git-annex.cabal
# Avoid warnings due to sometimes unused imports added for the splices.