diff options
| author | zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-02 09:58:15 +0000 |
|---|---|---|
| committer | zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-03-02 09:58:15 +0000 |
| commit | cade4137e1f229057b355ae6a67dde894b373443 (patch) | |
| tree | dbe450e56f1cf7df04e15e70a9607c4e7a1881b5 /navit/Makefile.am | |
| parent | 7c658490cf75a365e681d661511fc51e8f8694ac (diff) | |
| download | navit-svn-cade4137e1f229057b355ae6a67dde894b373443.tar.gz | |
Fix:Core:fixed bug in makefile for android, java files should now be always copied over from srcdir
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4273 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/Makefile.am')
| -rw-r--r-- | navit/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/navit/Makefile.am b/navit/Makefile.am index 0ee09ae1..e4785c06 100644 --- a/navit/Makefile.am +++ b/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 |