diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-08-26 16:51:33 +0200 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-08-26 16:51:33 +0200 |
| commit | 2bc9546ec1d4c1eb1aaf5973478a0b1edcc17278 (patch) | |
| tree | 68b5fcf44d1bb14c535a6f909d8554252a1300da /data | |
| parent | 2094cc8a534baf610f028676092deee6e29e8beb (diff) | |
| parent | dc721ac25d910a08fc3806330b2f8bd8d3b2a4dd (diff) | |
| download | ayatana-indicator-sound-2bc9546ec1d4c1eb1aaf5973478a0b1edcc17278.tar.gz ayatana-indicator-sound-2bc9546ec1d4c1eb1aaf5973478a0b1edcc17278.tar.bz2 ayatana-indicator-sound-2bc9546ec1d4c1eb1aaf5973478a0b1edcc17278.zip | |
Merge trunk
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 43 | ||||
| -rw-r--r-- | data/Makefile.am | 20 | ||||
| -rw-r--r-- | data/indicator-sound.service.in | 2 |
3 files changed, 44 insertions, 21 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..c66ca69 --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,43 @@ + +include(UseGSettings) + +########################### +# Indicator service +########################### + +set( + INDICATOR_DIR + "${CMAKE_INSTALL_DATADIR}/unity/indicators" + CACHE FILEPATH "Indicator directory" +) + +install( + FILES "com.canonical.indicator.sound" + DESTINATION "${INDICATOR_DIR}" +) + +########################### +# Dbus Service +########################### + +set( + INDICATOR_SOUND_SERVICE + "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.service" +) + +configure_file( + "indicator-sound.service.in" + ${INDICATOR_SOUND_SERVICE} + @ONLY +) + +install( + FILES "${INDICATOR_SOUND_SERVICE}" + DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/" +) + +########################### +# GSettings +########################### + +add_schema ("com.canonical.indicator.sound.gschema.xml") diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 7647d73..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -gsettings_SCHEMAS = \ - com.canonical.indicator.sound.gschema.xml -@GSETTINGS_RULES@ - -dbus_servicesdir = $(datadir)/dbus-1/services -dbus_services_DATA = indicator-sound.service - -%.service: %.service.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -indicatordir = $(INDICATOR_DIR) -dist_indicator_DATA = com.canonical.indicator.sound - -EXTRA_DIST = \ - $(gsettings_SCHEMAS) \ - indicator-sound.service.in - -CLEANFILES = \ - $(dbus_services_DATA) - diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in index e8b77c6..34309b2 100644 --- a/data/indicator-sound.service.in +++ b/data/indicator-sound.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=com.canonical.indicator.sound -Exec=@pkglibexecdir@/indicator-sound-service +Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service |