diff options
| author | Junfeng <junfeng.dong@intel.com> | 2013-03-19 17:18:58 +0800 |
|---|---|---|
| committer | lifang <fangx.li@intel.com> | 2013-03-29 05:47:15 +0800 |
| commit | 4da31383304bf68fe65ae3d4b430979f6f951f02 (patch) | |
| tree | 881d9d7570fe250996696079548cfe73be65744b | |
| parent | 276051d778cfd977c73efb77af05df78480f452e (diff) | |
| download | location-manager-4da31383304bf68fe65ae3d4b430979f6f951f02.tar.gz location-manager-4da31383304bf68fe65ae3d4b430979f6f951f02.tar.bz2 location-manager-4da31383304bf68fe65ae3d4b430979f6f951f02.zip | |
Fix for x86_64 compatibility.submit/tizen_2.1/20130424.230412accepted/tizen_2.1/20130425.0357012.1b_release
Change-Id: I726722edf2a387a118b0c4c824ea435ecfeee9de
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | capi-location-manager.pc.in | 2 | ||||
| -rwxr-xr-x | packaging/capi-location-manager.spec | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4174b65..abb007e 100755 --- 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} 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/location 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-location-manager.pc.in b/capi-location-manager.pc.in index 150e613..241551f 100644 --- a/capi-location-manager.pc.in +++ b/capi-location-manager.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=/usr/lib +libdir=@LIB_INSTALL_DIR@ includedir=/usr/include/location Name: @PC_NAME@ diff --git a/packaging/capi-location-manager.spec b/packaging/capi-location-manager.spec index 22b657f..5e20c79 100755 --- a/packaging/capi-location-manager.spec +++ b/packaging/capi-location-manager.spec @@ -31,7 +31,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} |