diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | services/unity-panel-service-lockscreen.conf.in | 2 | ||||
| -rw-r--r-- | services/unity-panel-service.conf.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index b80ec71ba..13a61716b 100644 --- a/services/CMakeLists.txt +++ b/services/CMakeLists.txt @@ -51,10 +51,10 @@ 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_PREFIX}/lib/unity/) +install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/) 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_PREFIX}/share/upstart/sessions) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions) configure_file(unity-panel-service-lockscreen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.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 b6a3cb600..b9255d825 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_PREFIX}/lib/unity/unity-panel-service --lockscreen-mode \ No newline at end of file +exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode diff --git a/services/unity-panel-service.conf.in b/services/unity-panel-service.conf.in index 742e39b1f..62712f833 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_PREFIX}/lib/unity/unity-panel-service +exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service |