Fix build for 64bit systems

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index c97a1dd..ab78fc9 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(tts C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR "${LIB_INSTALL_DIR}")
 SET(INCLUDEDIR "${PREFIX}/include")
 SET(VERSION 0.1.1)
 
@@ -60,7 +60,7 @@ CONFIGURE_FILE(tts.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc" @ONLY)
 CONFIGURE_FILE(tts-setting.pc.in "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-setting.pc" @ONLY)
 
 ## Install library files ##
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(TARGETS ${PROJECT_NAME}_setting DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES "${PROJECT_NAME}.pc" "${PROJECT_NAME}-setting.pc" DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib${LIB_SUFFIX} COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME}_setting DESTINATION lib${LIB_SUFFIX} COMPONENT RuntimeLibraries)
+INSTALL(FILES "${PROJECT_NAME}.pc" "${PROJECT_NAME}-setting.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tts.h ${CMAKE_CURRENT_SOURCE_DIR}/tts_setting.h DESTINATION include)

diff --git a/packaging/tts.changes b/packaging/tts.changes
new file mode 100644 (file)
index 0000000..32464c1
--- /dev/null
+++ b/packaging/tts.changes
@@ -0,0 +1,2 @@
+* Sun May 26 2013 Rusty Lynch <rusty.lynch@intel.com> accepted/tizen/20130520.101430@cfdfdae
+- Fix build for 64bit systems

diff --git a/packaging/tts.spec b/packaging/tts.spec
index f45b0fa..b421c7e 100755 (executable)
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -39,7 +39,7 @@ Text To Speech header files for TTS development.
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index b3db934..f4a0d5d 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -3,13 +3,13 @@ PROJECT(tts-daemon)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR "${LIB_INSTALL_DIR}")
 SET(INCLUDEDIR "${PREFIX}/include")
 SET(VERSION 0.0.1)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}")
-SET(LIBDIR "${PREFIX}/lib/voice/tts/1.0/engine")
+SET(LIBDIR "${LIB_INSTALL_DIR}/voice/tts/1.0/engine")
 SET(INCLUDEDIR "${PREFIX}/include")
 SET(VERSION 0.0.1)
 
@@ -90,5 +90,5 @@ INSTALL(TARGETS "${PROJECT_NAME}-noti" DESTINATION bin)
 INSTALL(TARGETS "${PROJECT_NAME}-sr" DESTINATION bin)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ttsp.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ttsd.conf DESTINATION lib/voice/tts/1.0)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ttsd.conf DESTINATION lib${LIB_SUFFIX}/voice/tts/1.0)