aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 10:58:05 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2022-02-16 10:58:05 +0100
commit3bbc1d0c2b8a54a940ef78300748074f3bf8f0d7 (patch)
tree827c950ddd6bb8838c90171dc063c2a3c8101d9b
parent0240328b9fd3680a041d9213696ca19816a7a58f (diff)
parent46041c56485856739d3274c63143c92aa9f8fb95 (diff)
downloadayatana-indicator-application-3bbc1d0c2b8a54a940ef78300748074f3bf8f0d7.tar.gz
ayatana-indicator-application-3bbc1d0c2b8a54a940ef78300748074f3bf8f0d7.tar.bz2
ayatana-indicator-application-3bbc1d0c2b8a54a940ef78300748074f3bf8f0d7.zip
Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir'
Attributes GH PR #22: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/22
-rw-r--r--.travis.yml2
-rw-r--r--data/CMakeLists.txt1
2 files changed, 1 insertions, 2 deletions
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
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 867db2f..6a8179a 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -16,7 +16,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