remove hard coded path for systemd in CMakeLists.txt

 - in yocto by default systemd is install into "/lib/systemd" not
   "/usr/lib/systemd".

Change-Id: Ia20662b7c4fd899f51f0311cd4d262ee3a00317a
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 093edb6..35f0636 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,8 +182,8 @@ INSTALL(FILES deviced.conf DESTINATION /etc/dbus-1/system.d)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/mmc-smack-label DESTINATION bin)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/shutdown.sh DESTINATION ${LIB_INSTALL_DIR}/system-server)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION lib/systemd/system)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket  DESTINATION lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION ${SYSTEMD_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket  DESTINATION ${SYSTEMD_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fsck-msdos/LICENSE DESTINATION share/license RENAME fsck_msdosfs)
 
 ADD_SUBDIRECTORY(restarter)

diff --git a/packaging/system-server.spec b/packaging/system-server.spec
index a4f6f79..83ced2a 100755 (executable)
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@ -160,7 +160,9 @@ cp %{SOURCE5} .
 cp %{SOURCE6} .
 
 %build
-%cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC
+%cmake . \
+       -DTZ_SYS_ETC=%TZ_SYS_ETC \
+       -DSYSTEMD_DIR=%{_unitdir}
 
 %install
 %make_install