summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--altosdroid/AndroidManifest.xml.in (renamed from altosdroid/AndroidManifest.xml)4
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 2 deletions
diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml.in
index 58f5077c..24035796 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml.in
@@ -17,8 +17,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.altusmetrum.AltosDroid"
- android:versionCode="7"
- android:versionName="1.6.0.3">
+ android:versionCode="@ANDROID_VERSION@"
+ android:versionName="@VERSION@">
<uses-sdk android:targetSdkVersion="12" android:minSdkVersion="12"/>
<!-- Google Maps -->
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
diff --git a/configure.ac b/configure.ac
index 0a7a7ea9..aa6cd798 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,12 +19,14 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
AC_INIT([altos], 1.6.0.3)
+ANDROID_VERSION=7
AC_CONFIG_SRCDIR([src/kernel/ao.h])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`
AC_SUBST(VERSION_DASH)
+AC_SUBST(ANDROID_VERSION)
dnl ==========================================================================
dnl Java library versions
@@ -529,6 +531,7 @@ telegps/Info.plist
telegps/telegps-windows.nsi
altosdroid/Makefile
altosdroid/local.properties
+altosdroid/AndroidManifest.xml
ao-tools/Makefile
ao-tools/lib/Makefile
ao-tools/ao-rawload/Makefile