mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

couple more android build fixes

Browse source
This commit is contained in:
Joey Hess 2013-02-13 17:56:10 -04:00
parent f342a0519b
commit 6e0f8c343b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -244,9 +244,10 @@ androidapp:
$(MAKE) -C standalone/android $(MAKE) -C standalone/android
rm -rf "$(ANDROIDAPP_DEST)" 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 -aR standalone/android/git-annex-bundle "$(ANDROIDAPP_DEST)"
cp -a standalone/android/runshell "$(ANDROIDAPP_DEST)"
install -d "$(ANDROIDAPP_DEST)/git-annex-bundle/bin" install -d "$(ANDROIDAPP_DEST)/git-annex-bundle/bin"
cp git-annex "$(ANDROIDAPP_DEST)/git-annex-bundle/bin/" cp git-annex "$(ANDROIDAPP_DEST)/git-annex-bundle/bin/"

1
standalone/android/Makefile
View file

@ -7,6 +7,7 @@ build: source
mkdir -p git-annex-bundle/bin 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 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 cp source/busybox/configs/android2_defconfig source/busybox/.config
echo 'CONFIG_FEATURE_INSTALLER=y' >> source/busybox/.config echo 'CONFIG_FEATURE_INSTALLER=y' >> source/busybox/.config