summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunfeng <junfeng.dong@intel.com>2013-03-21 18:48:58 +0800
committerlifang <fangx.li@intel.com>2013-03-29 05:39:48 +0800
commit7a4d1e0b34dc8a99fa4e110a8db688284e8effd2 (patch)
treefd159461b6c42ae4ff0deb6c76ab0048c409b5e6
parent8536dfd3b8a6f56780fb3e792f3e82a6f2ec5d69 (diff)
downloadmetadata-extractor-7a4d1e0b34dc8a99fa4e110a8db688284e8effd2.tar.gz
metadata-extractor-7a4d1e0b34dc8a99fa4e110a8db688284e8effd2.tar.bz2
metadata-extractor-7a4d1e0b34dc8a99fa4e110a8db688284e8effd2.zip
Fix for x86_64 compatibility.
Change-Id: I14d514d8afb010c7577ef5298d53eb8d54d1c716
-rwxr-xr-xCMakeLists.txt6
-rwxr-xr-xcapi-media-metadata-extractor.pc.in2
-rwxr-xr-xpackaging/capi-media-metadata-extractor.spec2
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea323ed..bf567a0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,14 +53,14 @@ ENDIF("${ARCH}" MATCHES "^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})
TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
INSTALL(
DIRECTORY ${INC_DIR}/ DESTINATION include/${service}
FILES_MATCHING
@@ -78,7 +78,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-metadata-extractor.pc.in b/capi-media-metadata-extractor.pc.in
index 773d667..6a6733d 100755
--- a/capi-media-metadata-extractor.pc.in
+++ b/capi-media-metadata-extractor.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-metadata-extractor.spec b/packaging/capi-media-metadata-extractor.spec
index 6b59e22..4cf35bf 100755
--- a/packaging/capi-media-metadata-extractor.spec
+++ b/packaging/capi-media-metadata-extractor.spec
@@ -29,7 +29,7 @@ A media metadata extractor library in SLP C API
%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}