diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-08-31 17:57:01 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-08-31 17:57:01 +0200 |
| commit | 6e791f5e47fde10f9bd1a80170fa46d0d7c49bcf (patch) | |
| tree | d2cdb533878977a2fd643288378b6bea4e6c4697 /services | |
| parent | 7997fa4290cdc551dfc7c07cfe2186f294269bf8 (diff) | |
| parent | 441ef596be2d17da00085692e0b2f77162ede238 (diff) | |
Merging with lp:~3v1n0/unity/cmake-libs-prefixes
(bzr r4153.9.32)
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 | 2 | ||||
| -rw-r--r-- | services/unity-panel-service.conf.in | 2 | ||||
| -rw-r--r-- | services/unity-panel-service.service.in | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt index 49b3d2f26..de866c108 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..0181f2747 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 index 970b3b5d6..7bfd0343a 100644 --- a/services/unity-panel-service-lockscreen.service.in +++ b/services/unity-panel-service-lockscreen.service.in @@ -3,5 +3,5 @@ Description=Backing Service for the Unity Panel in Lockscreen mode PartOf=unity-screen-locked.target [Service] -ExecStart=${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode +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..bb0c30162 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 diff --git a/services/unity-panel-service.service.in b/services/unity-panel-service.service.in index 858076e9b..806914ad4 100644 --- a/services/unity-panel-service.service.in +++ b/services/unity-panel-service.service.in @@ -5,5 +5,5 @@ PartOf=graphical-session.target BindsTo=indicators-pre.target [Service] -ExecStart=${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service +ExecStart=@UNITY_LIBDIR@/unity-panel-service Restart=on-failure |