Fix for x86_64 compatibility.

Change-Id: Ie547886b38b605643cc3c3d1a2029813e718a83c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbf1cec9af3bdb9624323ae280184dbe6b37216b..3612b630774becc01fdccd12954874b243985e1c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(${fw_name}
      CLEAN_DIRECT_OUTPUT 1
 )
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/${service}
         FILES_MATCHING
@@ -85,7 +85,7 @@ CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 #ADD_SUBDIRECTORY(test)
 

diff --git a/capi-media-wav-player.pc.in b/capi-media-wav-player.pc.in
index 5d02f8df41731b330865ef6f8930b8651473fff8..1997d91f362a69dea6a923c4f715fe7acc795399 100644 (file)
--- a/capi-media-wav-player.pc.in
+++ b/capi-media-wav-player.pc.in
@@ -3,7 +3,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/media
 
 Name: @PC_NAME@

diff --git a/packaging/capi-media-wav-player.spec b/packaging/capi-media-wav-player.spec
index e60a73955d39b93a6eb4b6b72443a787df47e7d0..d86c23d2354d5766e0407db82344f2cc42747110 100644 (file)
--- a/packaging/capi-media-wav-player.spec
+++ b/packaging/capi-media-wav-player.spec
@@ -32,7 +32,7 @@ Requires: %{name} = %{version}-%{release}
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 make %{?jobs:-j%jobs}