diff options
| author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:18:10 +0900 |
|---|---|---|
| committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:18:10 +0900 |
| commit | e9f9d045bb8fb2310170f182ea3c3e4e481b5c11 (patch) | |
| tree | a17bf449ad1e5e74463584e4e6e998ef13ce3aee | |
| parent | 06a451359ca218c72615641dd8e8d810c6833b58 (diff) | |
| download | libslp-sysman-tizen_2.1.tar.gz libslp-sysman-tizen_2.1.tar.bz2 libslp-sysman-tizen_2.1.zip | |
merge with mastersubmit/tizen_2.2/20130714.154211submit/tizen_2.1/20130424.233106accepted/tizen_2.1/20130425.0329082.1b_releasetizen_2.1
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | packaging/sysman.spec | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | set_pmon/set_pmon.c | 0 |
4 files changed, 4 insertions, 6 deletions
@@ -1,2 +1,2 @@ Giyeol Ok <giyeol.ok@samsung.com>
-Suchang Woo <Suchang Woo@samsung.com>
+Taesoo Jun <steve.jun@samsung.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt index 169ad5a..9f142e9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,12 +39,12 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysman.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysman_managed.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysman-internal.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/SLP_sysman_PG.h DESTINATION include/${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ADD_SUBDIRECTORY(set_pmon) diff --git a/packaging/sysman.spec b/packaging/sysman.spec index 7275031..fbd6459 100644 --- a/packaging/sysman.spec +++ b/packaging/sysman.spec @@ -6,8 +6,6 @@ Group: framework-system License: APLv2 Source0: %{name}-%{version}.tar.gz Source1001: packaging/sysman.manifest -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig BuildRequires: cmake BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(dlog) @@ -41,7 +39,7 @@ System Manager base library (devel) %build cp %{SOURCE1001} . -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} diff --git a/set_pmon/set_pmon.c b/set_pmon/set_pmon.c index ce0725c..ce0725c 100755..100644 --- a/set_pmon/set_pmon.c +++ b/set_pmon/set_pmon.c |