Rename SERVICE_NAME to SYSTEMD_SERVICE_NAME

This makes the name's meaning much less ambiguous.
AsteroidOS · Mar 22, 2022 · 76f57ae · 76f57ae
1 parent b1c70ba
commit 76f57ae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,19 +11,21 @@ option(WITH_DOC "Create project documentation" OFF)
 if (SAILFISHOS_PLATFORM)
     set(PLATFORM_SOURCE_DIR "platforms/sailfishos")
     set(DAEMON_PLATFORM_SOURCE_DIR "platforms/sailfishos")
-    set(SERVICE_NAME "harbour-asteroidsyncserviced.service")
+    set(SYSTEMD_SERVICE_NAME "harbour-asteroidsyncserviced.service")
 elseif (UBUNTU_TOUCH_PLATFORM)
     set(PLATFORM_SOURCE_DIR "platforms/ubuntutouch")
     set(DAEMON_PLATFORM_SOURCE_DIR "platforms/ubuntutouch")
-    set(SERVICE_NAME "")
+    set(SYSTEMD_SERVICE_NAME "")
 elseif (DESKTOP_PLATFORM)
     set(PLATFORM_SOURCE_DIR "platforms/sailfishos")
     set(DAEMON_PLATFORM_SOURCE_DIR "platforms/ubuntutouch")
-    set(SERVICE_NAME "asteroidsync.service")
+    set(SYSTEMD_SERVICE_NAME "asteroidsync.service")
 else()
     message(FATAL_ERROR "no platform selected: you must enable one of SAILFISHOS_PLATFORM or UBUNTU_TOUCH_PLATFORM or DESKTOP_PLATFORM")
 endif() 
 
+include(GNUInstallDirs)
+
 configure_file(
     "asteroidsyncservice_config.h.in"
     "asteroidsyncservice_config.h"

diff --git a/asteroidsyncservice/platforms/sailfishos/servicecontrol.h b/asteroidsyncservice/platforms/sailfishos/servicecontrol.h
@@ -24,7 +24,7 @@
 #include <QDBusInterface>
 #include <QObject>
 
-static const QString SYNCSERVICED_SYSTEMD_UNIT(SERVICE_NAME);
+static const QString SYNCSERVICED_SYSTEMD_UNIT(SYSTEMD_SERVICE_NAME);
 
 class ServiceControl : public QObject
 {

diff --git a/asteroidsyncservice_config.h.in b/asteroidsyncservice_config.h.in
@@ -21,6 +21,6 @@
 #define CONFIG_H
 
 #define VERSION "${asteroidsyncservice_VERSION_MAJOR}.${asteroidsyncservice_VERSION_MINOR}"
-#define SERVICE_NAME "${SERVICE_NAME}"
+#define SYSTEMD_SERVICE_NAME "${SYSTEMD_SERVICE_NAME}"
 
 #endif // CONFIG_H