merge with master

diff --git a/AUTHORS b/AUTHORS
index 1eb3c54..6edd069 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
 Giyeol Ok <giyeol.ok@samsung.com>\r
-Suchang Woo <Suchang Woo@samsung.com>\r
+Taesoo Jun <steve.jun@samsung.com>\r

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 169ad5a..9f142e9 100755 (executable)
--- 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 (file)
--- 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
old mode 100755 (executable)
new mode 100644 (file)