diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-09-01 23:58:01 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2016-09-01 23:58:01 +0000 |
| commit | 74ca57638845574ffb9bdb3d8808f98817d60f79 (patch) | |
| tree | 21ca23de9430fc60174e7e52ac64f44e78865b9e /services | |
| parent | fee779111435e7cfda848142092623d3d8bd50ca (diff) | |
| parent | 2b8246f01db8fb2b28557dac8d44b4c1ba9d3dea (diff) | |
CMake: move data and setting files in proper folder, define shared libdir variables
Approved by: Andrea Azzarone (bzr r4191)
Diffstat (limited to 'services')
| -rw-r--r-- | services/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | services/unity-panel-service-lockscreen.conf.in | 2 | ||||
| -rw-r--r-- | services/unity-panel-service-lockscreen.service.in | 7 | ||||
| -rw-r--r-- | services/unity-panel-service.conf.in | 2 |
4 files changed, 10 insertions, 3 deletions
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 |