fix TC error due to /usr/lib path

Change-Id: I0f7454177d04848d7f806d443f4f95c71cb55821

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70c4929..3d04b2b 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.41)
 
+IF (LIBDIR MATCHES "/usr/lib64")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLIB64")
+ENDIF (LIBDIR)
+
 ## Include common directory ##
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/common")
 
@@ -51,7 +55,7 @@ ADD_SUBDIRECTORY(server)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE RENAME tts DESTINATION /usr/share/license)
 
 ## Config ##
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-config.xml DESTINATION /usr/lib/voice/tts/1.0)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-config.xml DESTINATION ${LIBDIR}/voice/tts/1.0)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.conf DESTINATION /etc/dbus-1/system.d)
 

diff --git a/common/tts_defs.h b/common/tts_defs.h
index 7fe3943..3f517d6 100644 (file)
--- a/common/tts_defs.h
+++ b/common/tts_defs.h
@@ -68,7 +68,11 @@ extern "C" {
 * Defines for configuration
 *******************************************************************************************/
 
+#ifdef LIB64
+#define TTS_USR_BASE                   "/usr/lib64/voice/tts/1.0"
+#else
 #define TTS_USR_BASE                   "/usr/lib/voice/tts/1.0"
+#endif
 #define TTS_OPT_BASE                   "/opt/usr/data/voice/tts/1.0"
 
 #define TTS_DEFAULT_CONFIG             TTS_USR_BASE"/tts-config.xml"

diff --git a/packaging/tts.spec b/packaging/tts.spec
index a8a1565..c526705 100644 (file)
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -82,7 +82,7 @@ install LICENSE %{buildroot}/usr/share/license/%{name}
 %post 
 /sbin/ldconfig
 
-mkdir -p /usr/lib/voice
+mkdir -p %{_libdir}/voice
 
 mkdir -p /usr/share/voice
 
@@ -102,7 +102,7 @@ chown 5000:5000 /opt/usr/data/voice/tts/1.0/engine-info
 %manifest %{name}.manifest
 %defattr(-,system,system,-)
 %{_libdir}/lib*.so
-/usr/lib/voice/tts/1.0/tts-config.xml
+%{_libdir}/voice/tts/1.0/tts-config.xml
 %{_bindir}/tts-daemon*
 /usr/share/dbus-1/system-services/org.tizen.voice*
 /etc/dbus-1/system.d/tts-server.conf