From 6e0f8c343ba59094e8bf4466a6ebea0b32da3701 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Feb 2013 17:56:10 -0400 Subject: [PATCH] couple more android build fixes --- Makefile | 3 ++- standalone/android/Makefile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 504a9e974d..50600a24fc 100644 --- a/Makefile +++ b/Makefile @@ -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 81f76749a2..f931c060de 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