diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-20 14:43:23 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-06-20 14:43:23 -0500 |
| commit | a5fb857ee48a9022eb1e6c9ea04e0aeff80f445b (patch) | |
| tree | 39875a1ae2657e2a2a543150686347c769ddfb83 /data | |
| parent | 22e72bb60a789ba3a48aff737c8816908695b408 (diff) | |
| download | ayatana-indicator-session-a5fb857ee48a9022eb1e6c9ea04e0aeff80f445b.tar.gz ayatana-indicator-session-a5fb857ee48a9022eb1e6c9ea04e0aeff80f445b.tar.bz2 ayatana-indicator-session-a5fb857ee48a9022eb1e6c9ea04e0aeff80f445b.zip | |
cmake work: properly generate and install the .service file for dbus activation
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | data/indicator-session.service.in | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index c00b8db..84fe66c 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -5,18 +5,18 @@ include (GSettings) add_schemas(clinica-schemas ${CMAKE_SOURCE_DIR}/data/com.canonical.indicator.session.gschema.xml) # .service file -include (GNUInstallDirs) -configure_file (indicator-session.service.in indicator-session.service) +set(SERVICE_NAME "indicator-session.service") +set(SERVICE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}") +set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/indicator-session") +configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in" "${SERVICE_PATH}") +install (FILES ${SERVICE_PATH} + DESTINATION ${DBUSSERVICEDIR}) # .indicator file install(FILES com.canonical.indicator.session DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/indicators) # FIXME install files -#install(FILES -#${CMAKE_CURRENT_BINARY_DIR}/indicator-datetime.service -#DESTINATION share/indicator-datetime # FIXME to be the real install dir. -#) # #install(FILES #datetime-dialog.ui diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in index a4d10a1..e520e20 100644 --- a/data/indicator-session.service.in +++ b/data/indicator-session.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=com.canonical.indicator.session -Exec=@libexecdir@/indicator-session-service +Exec=@pkglibexecdir@/indicator-session-service |