From 51776b60df852a599ef24836ac3ecd8ceda983d3 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Tue, 8 Feb 2022 15:31:36 +0100
Subject: .travis.yml: Run CI builds on Travis CI's Ubuntu focal base system

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9556732..73bc55b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 # vim: set ts=2 sts=2 sw=2 expandtab :
-dist: bionic
+dist: focal
 language: shell
 os: linux
 
-- 
cgit v1.2.3


From bab7087b15336e5635289bcd5a47709693a21c4c Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 16 Feb 2022 10:36:14 +0100
Subject: Drop pkglibexecdir and use native CMake file configuration

---
 CMakeLists.txt                            | 3 ---
 data/CMakeLists.txt                       | 1 -
 data/ayatana-indicator-display.conf.in    | 2 +-
 data/ayatana-indicator-display.service.in | 2 +-
 src/CMakeLists.txt                        | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b4d29..c073735 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,9 +38,6 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     add_definitions("-Wall")
 endif()
 
-set(CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
-set(CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
-
 ##
 ## Gettext
 ##
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index cd052b6..17ddf23 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -32,7 +32,6 @@ if (${SYSTEMD_FOUND})
     set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
 
     # build it
-    set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
     configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
 
     # install it
diff --git a/data/ayatana-indicator-display.conf.in b/data/ayatana-indicator-display.conf.in
index 1231b5e..0254a34 100644
--- a/data/ayatana-indicator-display.conf.in
+++ b/data/ayatana-indicator-display.conf.in
@@ -6,4 +6,4 @@ stop on desktop-end or ayatana-indicator-services-end
 respawn
 respawn limit 2 10
 
-exec @pkglibexecdir@/ayatana-indicator-display-service
+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
diff --git a/data/ayatana-indicator-display.service.in b/data/ayatana-indicator-display.service.in
index cdfc1e0..4ae5d2b 100644
--- a/data/ayatana-indicator-display.service.in
+++ b/data/ayatana-indicator-display.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
 PartOf=ayatana-indicators.target
 
 [Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-display-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-display/ayatana-indicator-display-service
 Restart=on-failure
 
 [Install]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57bdc4b..b7e91aa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,5 +31,5 @@ target_link_libraries(${SERVICE_EXEC}
 install(
     TARGETS
         ${SERVICE_EXEC}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}
+    RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}"
 )
-- 
cgit v1.2.3