diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | haptic-plugin.pc.in | 2 | ||||
| -rw-r--r-- | haptic.pc.in | 2 | ||||
| -rw-r--r-- | packaging/libhaptic.spec | 30 |
4 files changed, 7 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c50a10..122476c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ PROJECT(haptic C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION 0.1) @@ -45,9 +44,9 @@ CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) CONFIGURE_FILE(${PROJECT_NAME}-plugin.pc.in ${PROJECT_NAME}-plugin.pc @ONLY) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION share/license RENAME ${PROJECT_NAME}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-plugin.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-plugin.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) FOREACH(hfile ${HEADERS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME}) diff --git a/haptic-plugin.pc.in b/haptic-plugin.pc.in index 9cfb39b..e90fc89 100644 --- a/haptic-plugin.pc.in +++ b/haptic-plugin.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: @PC_NAME@ diff --git a/haptic.pc.in b/haptic.pc.in index 58f59cb..477601d 100644 --- a/haptic.pc.in +++ b/haptic.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: @PC_NAME@ diff --git a/packaging/libhaptic.spec b/packaging/libhaptic.spec index 41722e6..58f83cc 100644 --- a/packaging/libhaptic.spec +++ b/packaging/libhaptic.spec @@ -1,14 +1,11 @@ -#sbs-git:slp/pkgs/d/devman devman 0.1.6 5bf2e95e0bb15c43ff928f7375e1978b0accb0f8 Name: libhaptic Summary: Haptic library Version: 0.1.0 Release: 9 Group: System/Libraries -License: Apache License, Version 2.0 +License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1: libhaptic.manifest -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) @@ -38,11 +35,10 @@ Haptic plugin library for device control (devel) %build cp %{SOURCE1} . -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} %make_install mkdir -p %{buildroot}%{_datadir}/license @@ -70,25 +66,3 @@ mkdir -p %{buildroot}%{_datadir}/license %{_includedir}/haptic/haptic_plugin_intf.h %{_libdir}/pkgconfig/haptic-plugin.pc -%changelog -* Thu Feb 28 2013 - Jae-young Hwang <j-zero.hwang@samsung.com> -- revise a member of effect element -- replace stime with level of haptic -- Tag - libhaptic_0.1.0-9 - -* Fri Jan 18 2013 - Jae-young Hwang <j-zero.hwang@samsung.com> -- revise value of haptic_state_e enum -- Tag - libhaptic_0.1.0-8 - -* Mon Jan 07 2013 - Jae-young Hwang <j-zero.hwang@samsung.com> -- Change libhpatic-module.so file path -- Tag - libhaptic_0.1.0-7 - -* Tue Oct 23 2012 - Jiyoung Yun <jy910.yun@samsung.com> -- remove capi-system-info pkg to fix build break error -- Tag : libhaptic_0.1.0-1 - -* Mon Oct 15 2012 - Jiyoung Yun <jy910.yun@samsung.com> -- Seperate the haptic module from devman -- Implement source code -- Tag : libhaptic_0.1.0-0 |