[evolution-data-server] Name D-Bus .service files by D-Bus service names they provide

[Milan Crha <mcrha src gnome org>]

commit dade60f2e25d7d6af8649f94536d0add2d7f0004
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 18 17:02:29 2020 +0100

    Name D-Bus .service files by D-Bus service names they provide
    
    It seems to be a good practice, to have the file named the same
    as the D-Bus service it provides. Found this as a claim in journalctl.

 src/services/evolution-addressbook-factory/CMakeLists.txt | 4 ++--
 src/services/evolution-calendar-factory/CMakeLists.txt    | 4 ++--
 src/services/evolution-source-registry/CMakeLists.txt     | 4 ++--
 src/services/evolution-user-prompter/CMakeLists.txt       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/services/evolution-addressbook-factory/CMakeLists.txt 
b/src/services/evolution-addressbook-factory/CMakeLists.txt
index 37bfc638e..6243af3dc 100644
--- a/src/services/evolution-addressbook-factory/CMakeLists.txt
+++ b/src/services/evolution-addressbook-factory/CMakeLists.txt
@@ -13,11 +13,11 @@ if(WITH_SYSTEMD_USER_UNITS)
 endif(WITH_SYSTEMD_USER_UNITS)
 
 configure_file(org.gnome.evolution.dataserver.AddressBook.service.in
-       org.gnome.evolution.dataserver.AddressBook.service
+       ${ADDRESS_BOOK_DBUS_SERVICE_NAME}.service
        @ONLY
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.evolution.dataserver.AddressBook.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ADDRESS_BOOK_DBUS_SERVICE_NAME}.service
        DESTINATION ${WITH_DBUS_SERVICE_DIR}
 )
 
diff --git a/src/services/evolution-calendar-factory/CMakeLists.txt 
b/src/services/evolution-calendar-factory/CMakeLists.txt
index 19e4df637..fe22e96eb 100644
--- a/src/services/evolution-calendar-factory/CMakeLists.txt
+++ b/src/services/evolution-calendar-factory/CMakeLists.txt
@@ -13,11 +13,11 @@ if(WITH_SYSTEMD_USER_UNITS)
 endif(WITH_SYSTEMD_USER_UNITS)
 
 configure_file(org.gnome.evolution.dataserver.Calendar.service.in
-       org.gnome.evolution.dataserver.Calendar.service
+       ${CALENDAR_DBUS_SERVICE_NAME}.service
        @ONLY
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.evolution.dataserver.Calendar.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CALENDAR_DBUS_SERVICE_NAME}.service
        DESTINATION ${WITH_DBUS_SERVICE_DIR}
 )
 
diff --git a/src/services/evolution-source-registry/CMakeLists.txt 
b/src/services/evolution-source-registry/CMakeLists.txt
index 1dfd24c50..487f8aef2 100644
--- a/src/services/evolution-source-registry/CMakeLists.txt
+++ b/src/services/evolution-source-registry/CMakeLists.txt
@@ -13,11 +13,11 @@ if(WITH_SYSTEMD_USER_UNITS)
 endif(WITH_SYSTEMD_USER_UNITS)
 
 configure_file(org.gnome.evolution.dataserver.Sources.service.in
-       org.gnome.evolution.dataserver.Sources.service
+       ${SOURCES_DBUS_SERVICE_NAME}.service
        @ONLY
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.evolution.dataserver.Sources.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCES_DBUS_SERVICE_NAME}.service
        DESTINATION ${WITH_DBUS_SERVICE_DIR}
 )
 
diff --git a/src/services/evolution-user-prompter/CMakeLists.txt 
b/src/services/evolution-user-prompter/CMakeLists.txt
index 3e727568f..cd96986a3 100644
--- a/src/services/evolution-user-prompter/CMakeLists.txt
+++ b/src/services/evolution-user-prompter/CMakeLists.txt
@@ -13,11 +13,11 @@ if(WITH_SYSTEMD_USER_UNITS)
 endif(WITH_SYSTEMD_USER_UNITS)
 
 configure_file(org.gnome.evolution.dataserver.UserPrompter.service.in
-       org.gnome.evolution.dataserver.UserPrompter.service
+       ${USER_PROMPTER_DBUS_SERVICE_NAME}.service
        @ONLY
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.evolution.dataserver.UserPrompter.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${USER_PROMPTER_DBUS_SERVICE_NAME}.service
        DESTINATION ${WITH_DBUS_SERVICE_DIR}
 )