4 files changed, 21 insertions, 31 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..123c63e
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,19 @@
+# ayatana-indicator-application.service
+
+pkg_check_modules(SYSTEMD systemd)
+
+if (${SYSTEMD_FOUND})
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-application.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" @ONLY)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.service" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/systemd/user")
+endif()
+
+# ayatana-indicator-application.desktop
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-application.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.desktop" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-application.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/xdg/autostart")
+
+# ordering-override.keyfile
+
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ordering-override.keyfile" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/ayatana-indicator-application")
+
+
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 671d5c0..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-NULL =
-
-xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = ayatana-indicator-application.desktop
-
-%.desktop: %.desktop.in
-	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-overridedir = $(pkgdatadir)
-override_DATA = ordering-override.keyfile
-
-#if defined(HAVE_SYSTEMD)
-%.service: %.service.in
-	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-systemddir = $(SYSTEMD_USERDIR)
-systemd_DATA = ayatana-indicator-application.service
-#endif
-
-EXTRA_DIST = \
-	ayatana-indicator-application.desktop.in \
-	ayatana-indicator-application.service.in \
-	ordering-override.keyfile \
-	$(NULL)
-
-CLEANFILES = \
-	ayatana-indicator-application.desktop \
-	ayatana-indicator-application.service \
-	$(NULL)
diff --git a/data/ayatana-indicator-application.desktop.in b/data/ayatana-indicator-application.desktop.in
index e624e98..4fce04f 100644
--- a/data/ayatana-indicator-application.desktop.in
+++ b/data/ayatana-indicator-application.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Ayatana Indicator Application
-Exec=@pkglibexecdir@/ayatana-indicator-application-service
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/ayatana-indicator-application/ayatana-indicator-application-service
 StartupNotify=false
 Terminal=false
 OnlyShowIn=Unity;MATE;XFCE;Budgie;
diff --git a/data/ayatana-indicator-application.service.in b/data/ayatana-indicator-application.service.in
index 3435853..fb2362d 100644
--- a/data/ayatana-indicator-application.service.in
+++ b/data/ayatana-indicator-application.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-application-service
+ExecStart=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/ayatana-indicator-application/ayatana-indicator-application-service
 Restart=on-failure
 
 [Install]