From 37b045dc5ba0512572d27a6e90c962ce4e3df5a0 Mon Sep 17 00:00:00 2001 From: zoff99 Date: Wed, 2 Mar 2011 09:58:15 +0000 Subject: [PATCH] Fix:Core:fixed bug in makefile for android, java files should now be always copied over from srcdir git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4273 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/Makefile.am | 5 +++-- navit/navit/android/dummy.txt | 0 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 navit/navit/android/dummy.txt diff --git a/navit/navit/Makefile.am b/navit/navit/Makefile.am index 0ee09ae..e4785c0 100644 --- a/navit/navit/Makefile.am +++ b/navit/navit/Makefile.am @@ -111,9 +111,10 @@ android/AndroidManifest.xml: android/AndroidManifest.xml.in sed -e "s/@ANDROID_VERSION_NAME@/$(v_name)/" <$@ >android/AndroidManifest.xml.tmp mv android/AndroidManifest.xml.tmp $@ - -android/build.xml: android/AndroidManifest.xml +android/build.xml: android/AndroidManifest.xml android/dummy.txt + if [ "$(builddir)" != "$(srcdir)" ]; then rm -Rf android/; fi mkdir -p android + touch android/dummy.txt if [ "$(builddir)" != "$(srcdir)" ]; then cp -rp $(srcdir)/android/* $(builddir)/android; fi android update project -t @ANDROID_PROJECT@ -p android diff --git a/navit/navit/android/dummy.txt b/navit/navit/android/dummy.txt new file mode 100644 index 0000000..e69de29 -- 2.7.4