From c60449fa25d76bd30668ae0de870d3897372b09b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 31 Oct 2012 21:34:43 +0300
Subject: Fix PKG_DATADIR and LOCALEDIR for Android.

---
 src/main.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main.h b/src/main.h
index 6626db6d9..33284e77b 100644
--- a/src/main.h
+++ b/src/main.h
@@ -58,14 +58,14 @@
 
 #if defined __APPLE__
 #define PACKAGE_OS "Apple"
+#elif defined(__ANDROID__) || defined(ANDROID)
+#define PACKAGE_OS "Android"
 #elif defined __FreeBSD__ || defined __DragonFly__
 #define PACKAGE_OS "FreeBSD"
 #elif defined __NetBSD__
 #define PACKAGE_OS "NetBSD"
 #elif defined __OpenBSD__
 #define PACKAGE_OS "OpenBSD"
-#elif defined(__ANDROID__) || defined(ANDROID)
-#define PACKAGE_OS "Android"
 #elif defined __linux__ || defined __linux
 #define PACKAGE_OS "Linux"
 #elif defined __GNU__
@@ -95,6 +95,16 @@
 
 #define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS
 
+#ifdef ANDROID
+#ifdef PKG_DATADIR
+#undef PKG_DATADIR
+#endif
+#ifdef LOCALEDIR
+#undef LOCALEDIR
+#endif
+#define LOCALEDIR "locale"
+#endif
+
 #ifndef PKG_DATADIR
 #define PKG_DATADIR ""
 #endif
-- 
cgit v1.2.3-60-g2f50