Fixed bug the systemd file location in install time.

Change-Id: I06489290e19a94d94463b0968ff0a7ee371fdeeb
Signed-off-by: Jung Ick Guack <jiguack@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 425399ef940ebbcee29942bc1d5009884c89b111..558feb0bb3287980714f8485a86efd7ba05f5a01 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,8 @@ ADD_SUBDIRECTORY(history-adaptor/)
 
 PROJECT(${PKG_NAME} C)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/browser-provider.service DESTINATION ${LIB_INSTALL_DIR}/systemd/system)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/browser-provider.socket DESTINATION ${LIB_INSTALL_DIR}/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/browser-provider.service DESTINATION lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/browser-provider.socket DESTINATION lib/systemd/system)
 
 IF(DEFINED PKG_LICENSE_PATH)
        CONFIGURE_FILE(LICENSE.APLv2 share/license/${PROJECT_NAME})

diff --git a/packaging/browser-provider.spec b/packaging/browser-provider.spec
index efc2b8ba28611f7ba7fdbb70eaab567ca1dcbe15..b4c809a63d213fd4e80492c9d7b67d3d236ad059 100755 (executable)
--- a/packaging/browser-provider.spec
+++ b/packaging/browser-provider.spec
@@ -93,10 +93,8 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
-ln -s ../browser-provider.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/
-ln -s ../browser-provider.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/
+%install_service multi-user.target.wants browser-provider.service
+%install_service sockets.target.wants browser-provider.socket
 
 %post
 /sbin/ldconfig
@@ -122,10 +120,10 @@ mkdir -p %{_notifydir}
 %{_libdir}/libcapi-web-history.so.0
 %{_license_path}/%{name}
 %manifest %{name}.manifest
-%{_libdir}/systemd/system/browser-provider.service
-%{_libdir}/systemd/system/multi-user.target.wants/browser-provider.service
-%{_libdir}/systemd/system/browser-provider.socket
-%{_libdir}/systemd/system/sockets.target.wants/browser-provider.socket
+%{_unitdir}/browser-provider.service
+%{_unitdir}/multi-user.target.wants/browser-provider.service
+%{_unitdir}/browser-provider.socket
+%{_unitdir}/sockets.target.wants/browser-provider.socket
 
 %files devel
 %defattr(-,root,root,-)