diff options
author | Junfeng Dong <junfeng.dong@intel.com> | 2013-03-25 18:57:18 +0800 |
---|---|---|
committer | lifang <fangx.li@intel.com> | 2013-03-29 05:23:15 +0800 |
commit | bf5f6ec227c7f0030985a6bc4a1fc34226c986ea (patch) | |
tree | 897833482b0e5b93b7d6847ca838428df9cdbd84 | |
parent | ef99ea8e643867d3964802a98e761c609bd1c571 (diff) | |
download | liblocation-appman-accepted/tizen_2.1/20130425.035151.tar.gz liblocation-appman-accepted/tizen_2.1/20130425.035151.tar.bz2 liblocation-appman-accepted/tizen_2.1/20130425.035151.zip |
Fix for 64 bit compatibility.submit/tizen_2.1/20130424.231556submit/tizen/20130611.161324accepted/tizen_2.1/20130425.035151accepted/tizen/20130611.1535432.1b_releasetizen_2.1
- Fix hardcoding path.
- Use %cmake to set default paths.
Change-Id: Id4d3c9b745f2cb323f540177a7c6bb687d4c1ebb
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | location-appman.pc.in | 2 | ||||
-rw-r--r-- | packaging/liblocation-appman.spec | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 30edd2a..51333b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") ADD_DEFINITIONS("-DLOCATION_APPMAN_DBDIR=\"${DBDIR}\"") -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}) @@ -41,9 +41,9 @@ SET_TARGET_PROPERTIES(${fw_name} TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} "-lgcrypt") -INSTALL(TARGETS ${fw_name} DESTINATION lib) +INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( - DIRECTORY ${INC_DIR}/ DESTINATION include/location-appman + DIRECTORY ${INC_DIR}/ DESTINATION ${INCLUDE_INSTALL_DIR}/location-appman FILES_MATCHING PATTERN "${INC_DIR}/location-appman.h" PATTERN "${INC_DIR}/location-appman-crypt.h" @@ -67,7 +67,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) #create db #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/location-appman.sql DESTINATION ${ETCDIR}) diff --git a/location-appman.pc.in b/location-appman.pc.in index 3c4555a..be70491 100644 --- a/location-appman.pc.in +++ b/location-appman.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=/usr/lib +libdir=@LIB_INSTALL_DIR@ includedir=/usr/include/location-appman Name: @PC_NAME@ diff --git a/packaging/liblocation-appman.spec b/packaging/liblocation-appman.spec index 033e28b..ec9acaf 100644 --- a/packaging/liblocation-appman.spec +++ b/packaging/liblocation-appman.spec @@ -34,7 +34,7 @@ Description : Location DB controller Development Package %build -cmake . -DCMAKE_INSTALL_PREFIX=/usr +%cmake . # Call make instruction with smp support make %{?jobs:-j%jobs} @@ -44,7 +44,7 @@ make %{?jobs:-j%jobs} chown 0:5000 /opt/dbspace/.location-appman.db* chmod 664 /opt/dbspace/.location-appman.db* -if [ -f /usr/lib/rpm-plugins/msm.so ] +if [ -f %{_libdir}/rpm-plugins/msm.so ] then chsmack -a 'location_fw::db' /opt/dbspace/.location-appman.db* fi |