diff options
author | Joey Hess <joey@kitenet.net> | 2013-02-13 17:56:10 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-02-13 17:56:10 -0400 |
commit | f7130bdb787b96c6f092f8aaf753c585ddd46cd5 (patch) | |
tree | d787bba16203d42375638a865d9517d0ca05e06e | |
parent | 6ad33950b87eafc8a4048dd7b9352e888d25cf63 (diff) |
couple more android build fixes
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | standalone/android/Makefile | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -244,9 +244,10 @@ androidapp: $(MAKE) -C standalone/android rm -rf "$(ANDROIDAPP_DEST)" + install -d "$(ANDROIDAPP_DEST)" - cp -a standalone/android/runshell "$(ANDROIDAPP_DEST)" cp -aR standalone/android/git-annex-bundle "$(ANDROIDAPP_DEST)" + cp -a standalone/android/runshell "$(ANDROIDAPP_DEST)" install -d "$(ANDROIDAPP_DEST)/git-annex-bundle/bin" cp git-annex "$(ANDROIDAPP_DEST)/git-annex-bundle/bin/" diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 81f76749a..f931c060d 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -7,6 +7,7 @@ build: source mkdir -p git-annex-bundle/bin cd source/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 prefix= DESTDIR=../../git-annex-bundle + rm -f git-annex-bundle/bin/git-cvsserver cp source/busybox/configs/android2_defconfig source/busybox/.config echo 'CONFIG_FEATURE_INSTALLER=y' >> source/busybox/.config |