diff options
author | Rafal Krypa <r.krypa@samsung.com> | 2014-06-26 17:15:02 +0200 |
---|---|---|
committer | Rafal Krypa <r.krypa@samsung.com> | 2014-07-01 02:14:10 -0700 |
commit | 721bf7c5160b6060e3e3c0b337a9b7c4bc124bc3 (patch) | |
tree | b492991f2f6a9470900811d0f14f0e79615f3de5 | |
parent | 664fec5054ca386f240e13c3d7846f65adae8777 (diff) | |
download | security-manager-721bf7c5160b6060e3e3c0b337a9b7c4bc124bc3.tar.gz security-manager-721bf7c5160b6060e3e3c0b337a9b7c4bc124bc3.tar.bz2 security-manager-721bf7c5160b6060e3e3c0b337a9b7c4bc124bc3.zip |
Use variables instead of hardcoded paths to /usr/bin and /usr/lib
Change-Id: If329d3346ccb1da5c2c697c5a90d81c77a977077
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
-rw-r--r-- | packaging/security-manager.spec | 21 | ||||
-rw-r--r-- | src/server/CMakeLists.txt | 2 | ||||
-rw-r--r-- | systemd/CMakeLists.txt | 11 | ||||
-rw-r--r-- | systemd/security-manager.service.in (renamed from systemd/security-manager.service) | 2 |
4 files changed, 19 insertions, 17 deletions
diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec index 58738dd4..f339a155 100644 --- a/packaging/security-manager.spec +++ b/packaging/security-manager.spec @@ -56,6 +56,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" export LDFLAGS+="-Wl,--rpath=%{_libdir}" %cmake . -DVERSION=%{version} \ + -DBIN_INSTALL_DIR=%{_bindir} \ -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \ -DCMAKE_VERBOSE_MAKEFILE=ON make %{?jobs:-j%jobs} @@ -69,10 +70,10 @@ mkdir -p %{buildroot}/etc/smack/ cp app-rules-template.smack %{buildroot}/etc/smack/ %make_install -mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants -ln -s ../security-manager.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/security-manager.service -ln -s ../security-manager-installer.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-manager-installer.socket +mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants +mkdir -p %{buildroot}/%{_unitdir}/sockets.target.wants +ln -s ../security-manager.service %{buildroot}/%{_unitdir}/multi-user.target.wants/security-manager.service +ln -s ../security-manager-installer.socket %{buildroot}/%{_unitdir}/sockets.target.wants/security-manager-installer.socket %clean rm -rf %{buildroot} @@ -108,13 +109,13 @@ fi %files -n security-manager %manifest security-manager.manifest %defattr(-,root,root,-) -%attr(755,root,root) /usr/bin/security-manager +%attr(755,root,root) %{_bindir}/security-manager %{_libdir}/libsecurity-manager-commons.so.* -%attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/security-manager.service -%attr(-,root,root) /usr/lib/systemd/system/security-manager.service -%attr(-,root,root) /usr/lib/systemd/system/security-manager.target -%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-manager-installer.socket -%attr(-,root,root) /usr/lib/systemd/system/security-manager-installer.socket +%attr(-,root,root) %{_unitdir}/multi-user.target.wants/security-manager.service +%attr(-,root,root) %{_unitdir}/security-manager.service +%attr(-,root,root) %{_unitdir}/security-manager.target +%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-manager-installer.socket +%attr(-,root,root) %{_unitdir}/security-manager-installer.socket %attr(-,root,root) /etc/smack/app-rules-template.smack %{_datadir}/license/%{name} diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 5d7db002..128b318c 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(${TARGET_SERVER} ${SERVER_DEP_LIBRARIES} ) -INSTALL(TARGETS ${TARGET_SERVER} DESTINATION bin) +INSTALL(TARGETS ${TARGET_SERVER} DESTINATION ${BIN_INSTALL_DIR}) diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index b432ad47..36c306f6 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -1,8 +1,9 @@ +CONFIGURE_FILE(security-manager.service.in security-manager.service @ONLY) + INSTALL(FILES - ${CMAKE_SOURCE_DIR}/systemd/security-manager.service - ${CMAKE_SOURCE_DIR}/systemd/security-manager.target - ${CMAKE_SOURCE_DIR}/systemd/security-manager-installer.socket + security-manager.service + security-manager.target + security-manager-installer.socket DESTINATION - /usr/lib/systemd/system + ${LIB_INSTALL_DIR}/systemd/system ) - diff --git a/systemd/security-manager.service b/systemd/security-manager.service.in index e96e6fbd..df0b0775 100644 --- a/systemd/security-manager.service +++ b/systemd/security-manager.service.in @@ -3,7 +3,7 @@ Description=Start the security manager [Service] Type=notify -ExecStart=/usr/bin/security-manager +ExecStart=@BIN_INSTALL_DIR@/security-manager Sockets=security-manager-installer.socket |