From a54a1472e08b902d7dc7e0f54f265d9bf4f54119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 31 Aug 2016 17:05:58 +0200 Subject: CMake: use UNITY_LIBDIR in a more shared way (bzr r4177.4.1) --- services/CMakeLists.txt | 2 +- services/unity-panel-service-lockscreen.conf.in | 2 +- services/unity-panel-service-lockscreen.service.in | 7 +++++++ services/unity-panel-service.conf.in | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 services/unity-panel-service-lockscreen.service.in (limited to 'services') diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index 13a61716b..46915fea4 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -51,7 +51,7 @@ link_directories(${LIB_PATHS}) add_executable(unity-panel-service ${PANEL_SOURCES}) target_link_libraries(unity-panel-service ${LIBS}) -install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/) +install(TARGETS unity-panel-service DESTINATION ${UNITY_INSTALL_LIBDIR}) configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions) diff --git a/services/unity-panel-service-lockscreen.conf.in b/services/unity-panel-service-lockscreen.conf.in index b9255d825..d9ceb3276 100644 --- a/services/unity-panel-service-lockscreen.conf.in +++ b/services/unity-panel-service-lockscreen.conf.in @@ -5,4 +5,4 @@ start on desktop-lock stop on desktop-unlock respawn -exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode +exec ${UNITY_LIBDIR}/unity-panel-service --lockscreen-mode diff --git a/services/unity-panel-service-lockscreen.service.in b/services/unity-panel-service-lockscreen.service.in new file mode 100644 index 000000000..d1b1eb6ff --- /dev/null +++ b/services/unity-panel-service-lockscreen.service.in @@ -0,0 +1,7 @@ +[Unit] +Description=Backing Service for the Unity Panel in Lockscreen mode +PartOf=unity-screen-locked.target + +[Service] +ExecStart=${UNITY_LIBDIR}/unity-panel-service --lockscreen-mode +Restart=on-failure diff --git a/services/unity-panel-service.conf.in b/services/unity-panel-service.conf.in index 62712f833..5fc3e012b 100644 --- a/services/unity-panel-service.conf.in +++ b/services/unity-panel-service.conf.in @@ -15,4 +15,4 @@ emits indicator-services-start emits indicator-services-end respawn -exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service +exec ${UNITY_LIBDIR}/unity-panel-service -- cgit v1.2.3