From 3fc70514615c4fe2b14f33ec41be0f549e6049ee Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Fri, 15 Oct 2021 22:42:42 +0200
Subject: Do a natural CMake file configuration

---
 data/CMakeLists.txt                        |  6 ++----
 data/ayatana-indicator-messages.desktop.in |  2 +-
 data/ayatana-indicator-messages.service.in |  2 +-
 doc/reference/CMakeLists.txt               |  1 -
 doc/reference/messaging-menu-docs.xml.in   |  2 +-
 libmessaging-menu/CMakeLists.txt           |  5 -----
 libmessaging-menu/messaging-menu.pc.in     | 10 +++++-----
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 03fba70..76bed98 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -10,15 +10,13 @@ pkg_check_modules(SYSTEMD systemd)
 
 if (${SYSTEMD_FOUND})
     pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
-    set (pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-indicator-messages")# Rewrite and drop once we've switched to CMake
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-messages.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.service")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-messages.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.service" @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.service" DESTINATION "${SYSTEMD_USER_DIR}")
 endif()
 
 # ayatana-indicator-messages.desktop
 
-set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/ayatana-indicator-messages")# Rewrite and drop once we've switched to CMake
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-messages.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.desktop")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-messages.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.desktop" @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.desktop" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart")
 
 # org.ayatana.indicator.messages
diff --git a/data/ayatana-indicator-messages.desktop.in b/data/ayatana-indicator-messages.desktop.in
index 5fdb313..a2f5036 100644
--- a/data/ayatana-indicator-messages.desktop.in
+++ b/data/ayatana-indicator-messages.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Ayatana Indicator Messages
-Exec=@pkglibexecdir@/ayatana-indicator-messages-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-messages/ayatana-indicator-messages-service
 NoDisplay=true
 StartupNotify=false
 Terminal=false
diff --git a/data/ayatana-indicator-messages.service.in b/data/ayatana-indicator-messages.service.in
index a0a3ba0..d6976dd 100644
--- a/data/ayatana-indicator-messages.service.in
+++ b/data/ayatana-indicator-messages.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-messages-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-messages/ayatana-indicator-messages-service
 Restart=on-failure
 
 [Install]
diff --git a/doc/reference/CMakeLists.txt b/doc/reference/CMakeLists.txt
index 4688d41..ed949c2 100644
--- a/doc/reference/CMakeLists.txt
+++ b/doc/reference/CMakeLists.txt
@@ -1,6 +1,5 @@
 # messaging-menu-docs.xml
 
-set(PACKAGE_VERSION ${PROJECT_VERSION})# Rewrite and drop once we've switched to CMake
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/messaging-menu-docs.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/messaging-menu-docs.xml" @ONLY)
 
 # messaging-menu-decl.txt
diff --git a/doc/reference/messaging-menu-docs.xml.in b/doc/reference/messaging-menu-docs.xml.in
index 9319875..caa499c 100644
--- a/doc/reference/messaging-menu-docs.xml.in
+++ b/doc/reference/messaging-menu-docs.xml.in
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                       'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd' [
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-<!ENTITY version "@PACKAGE_VERSION@">
+<!ENTITY version "@PROJECT_VERSION@">
 ]>
 <book lang="en" id="messaging-menu" xmlns:xi="http://www.w3.org/2003/XInclude">
 <title>Messaging Menu Reference Manual</title>
diff --git a/libmessaging-menu/CMakeLists.txt b/libmessaging-menu/CMakeLists.txt
index f2f9c24..2d3d6ac 100644
--- a/libmessaging-menu/CMakeLists.txt
+++ b/libmessaging-menu/CMakeLists.txt
@@ -1,10 +1,5 @@
 # messaging-menu.pc
 
-set(prefix "${CMAKE_INSTALL_PREFIX}")# Rewrite and drop once we've switched to CMake
-set(exec_prefix "\${prefix}")# Rewrite and drop once we've switched to CMake
-set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")# Rewrite and drop once we've switched to CMake
-set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")# Rewrite and drop once we've switched to CMake
-set(VERSION "${PROJECT_VERSION}")# Rewrite and drop once we've switched to CMake
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/messaging-menu.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/messaging-menu.pc" @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/messaging-menu.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
 
diff --git a/libmessaging-menu/messaging-menu.pc.in b/libmessaging-menu/messaging-menu.pc.in
index 24ac4bc..d241276 100644
--- a/libmessaging-menu/messaging-menu.pc.in
+++ b/libmessaging-menu/messaging-menu.pc.in
@@ -1,11 +1,11 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/messaging-menu
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/messaging-menu
 
 Name: Ayatana Messaging Menu Library
 Description: Ayatana Messaging Menu client library
-Version: @VERSION@
+Version: @PROJECT_VERSION@
 Requires: gio-unix-2.0
 Libs: -L${libdir} -lmessaging-menu
 Cflags: -I${includedir}
-- 
cgit v1.2.3