Fix build error on x64 environment

Change-Id: I4e95021f5e70b58b776f8abff2e526e94e7f140d
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e75836800f0d866c5ed32889b929701c347001d..8417a3a98cde16fd0fc2b482d8c7c3d2b3e8daa7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
@@ -43,7 +43,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/media
         FILES_MATCHING
@@ -61,7 +61,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-tool.pc.in b/capi-media-tool.pc.in
index afda32e14f1268d76ece8f1ca322d4d7ccb1c366..15084891767c2af9ebb0eebe766dc40f74742af0 100644 (file)
--- a/capi-media-tool.pc.in
+++ b/capi-media-tool.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-tool.spec b/packaging/capi-media-tool.spec
index 184b1974c653c60f8a957a1435b885df99276335..05e39f967cee2455a47323eed9c9ad32a886cb47 100644 (file)
--- a/packaging/capi-media-tool.spec
+++ b/packaging/capi-media-tool.spec
@@ -1,7 +1,7 @@
 Name:       capi-media-tool
 Summary:    A Core API media tool library in Tizen Native API
 Version:    0.1.1
-Release:    0
+Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -19,14 +19,18 @@ Requires(postun): /sbin/ldconfig
 %description
 A Core API media tool library in Tizen Native API
 
+
 %package devel
 Summary:  A Core API media tool library in Tizen Native API (Development)
 Group:    Multimedia/API
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(libtbm)
 
+
 %description devel
 %devel_desc
+
+
 %prep
 %setup -q
 
@@ -38,24 +42,23 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-
-
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 make %{?jobs:-j%jobs}
 
+
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-mkdir -p %{buildroot}/usr/bin
+mkdir -p %{buildroot}%{_datadir}/license
 mkdir -p %{buildroot}/opt/usr/devel
 cp test/media_packet_test %{buildroot}/opt/usr/devel
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-
+cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
 %make_install
 
+
 %post
 /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
 
@@ -66,9 +69,9 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
 /opt/usr/devel/*
 #%{_bindir}/*
 
+
 %files devel
 %{_includedir}/media/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libcapi-media-tool.so
 
-