diff options
| author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:12:45 +0900 |
|---|---|---|
| committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:12:45 +0900 |
| commit | 793245d1a9c1d29bf7551f6f6e6d2995cd6af401 (patch) | |
| tree | 7ecc32e0cbf4976d281d2dfb64e36d1f605ffdcb | |
| parent | 148959c2ec0e202910c578064f8da39ee95fb608 (diff) | |
| download | status-793245d1a9c1d29bf7551f6f6e6d2995cd6af401.tar.gz status-793245d1a9c1d29bf7551f6f6e6d2995cd6af401.tar.bz2 status-793245d1a9c1d29bf7551f6f6e6d2995cd6af401.zip | |
merge with mastersubmit/tizen_2.1/20130424.230925submit/tizen/20130517.044827accepted/tizen_2.1/20130425.035422accepted/tizen/20130520.1009422.1b_releasetizen_2.1
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | packaging/status.spec | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 88c724f..6e0eedb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,13 +46,13 @@ FOREACH(lib_file ${SUBMODULES}) TARGET_LINK_LIBRARIES(${lib_file} ${pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${lib_file} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${lib_file} PROPERTIES VERSION ${VERSION}) - INSTALL(TARGETS ${lib_file} DESTINATION lib COMPONENT RuntimeLibraries) + INSTALL(TARGETS ${lib_file} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ENDFOREACH(lib_file) FOREACH(pcfile ${SUBMODULES}) CONFIGURE_FILE(${pcfile}.pc.in ${pcfile}.pc @ONLY) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${pcfile}.pc") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION lib/pkgconfig) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ENDFOREACH(pcfile) FOREACH(hfile ${INSTALL_HEADERS}) diff --git a/packaging/status.spec b/packaging/status.spec index df26f35..9233398 100755 --- a/packaging/status.spec +++ b/packaging/status.spec @@ -1,7 +1,7 @@ Name: status Summary: status library Version: 0.0.1 -Release: 2 +Release: 1 Group: TBD License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -11,7 +11,8 @@ BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(aul) BuildRequires: cmake Requires(post): /sbin/ldconfig -requires(postun): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + %description Status library. @@ -27,8 +28,8 @@ Requires: %{name} = %{version}-%{release} Status library (devel). %build -export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed" -LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed" +%cmake . make %{?jobs:-j%jobs} %install |