Fix buld break on x86_64, regression in 3e62e851

Unify systemd installation directories between spec and CMake, avoiding
problems on x86_64 (/usr/lib64 vs. /usr/lib).

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

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index 85d5550..469511b 100644 (file)
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -60,6 +60,7 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 %cmake . -DVERSION=%{version} \
         -DBIN_INSTALL_DIR=%{_bindir} \
         -DDB_INSTALL_DIR=%{TZ_SYS_DB} \
+        -DSYSTEMD_INSTALL_DIR=%{_unitdir} \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DCMAKE_VERBOSE_MAKEFILE=ON
 make %{?jobs:-j%jobs}

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 36c306f..9c2ac54 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -5,5 +5,5 @@ INSTALL(FILES
     security-manager.target
     security-manager-installer.socket
     DESTINATION
-    ${LIB_INSTALL_DIR}/systemd/system
+    ${SYSTEMD_INSTALL_DIR}
 )