Fix lib path for 64bit

Change-Id: Ie91a9d923378f3140287bbc486ff30bbd2fc302f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e4799d502f99961284399d47f535530d56e3aca..20f41be0a6efe592fbc7c1083b4f7aae211d928a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,10 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
 SET(VERSION 0.2.54)
 
+IF (LIBDIR MATCHES "/usr/lib64")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLIB64")
+ENDIF (LIBDIR)
+
 ## Include common directory ##
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/common")
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")

diff --git a/common/stt_defs.h b/common/stt_defs.h
index e5f7a15cc1390eab7e6cf2ef9b03fedce9ad8e9d..1a9921e763a3025977f12f1902a2505cf9887e10 100644 (file)
--- a/common/stt_defs.h
+++ b/common/stt_defs.h
@@ -71,7 +71,11 @@ extern "C" {
 
 #define STT_TIME_INFO_PATH             tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-time.xml")
 
+#ifdef LIB64
+#define STT_USR_BASE                   "/usr/lib64/voice"
+#else
 #define STT_USR_BASE                   "/usr/lib/voice"
+#endif
 #define STT_OPT_BASE                   "/opt/usr/data/voice"
 
 #define STT_DEFAULT_CONFIG             STT_USR_BASE"/stt/1.0/stt-config.xml"