Use variables instead of hardcoded paths to /usr/bin and /usr/lib

Change-Id: If329d3346ccb1da5c2c697c5a90d81c77a977077
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index 58738dd..f339a15 100644 (file)
--- 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 5d7db00..128b318 100644 (file)
--- 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 b432ad4..36c306f 100644 (file)
--- 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
similarity index 76%
rename from systemd/security-manager.service
rename to systemd/security-manager.service.in
index e96e6fb..df0b077 100644 (file)
--- 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