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

---
 libmessaging-menu/CMakeLists.txt       |  5 -----
 libmessaging-menu/messaging-menu.pc.in | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'libmessaging-menu')

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