diff options
| author | Weblate <noreply@weblate.org> | 2017-10-07 21:09:48 +0200 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-10-07 21:09:48 +0200 |
| commit | 2cddae13f83e2710c0235f73f3868d657864d2cd (patch) | |
| tree | c5485e45b0cc07e7825530a3482c269c37b2e92e | |
| parent | 143852873633b34daa7f17d4ae5e3a3be3e939cf (diff) | |
| parent | 73e22113dcface8c3139a77cd90a5ad5c30136e5 (diff) | |
| download | ayatana-indicator-session-2cddae13f83e2710c0235f73f3868d657864d2cd.tar.gz ayatana-indicator-session-2cddae13f83e2710c0235f73f3868d657864d2cd.tar.bz2 ayatana-indicator-session-2cddae13f83e2710c0235f73f3868d657864d2cd.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | data/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 24 insertions, 22 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index f3feeff..fd2904d 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -19,33 +19,35 @@ add_schema (${SCHEMA_FILE}) ## Systemd Unit File ## -# where to install -# Uncomment when we drop Vivid -# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir) -set (SYSTEMD_USER_DIR "/usr/lib/systemd/user") -message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir") +pkg_check_modules(SYSTEMD systemd) +if (${SYSTEMD_FOUND}) -set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service") -set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}") -set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in") + pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir) + message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir") -# build it -set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") -configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}") + set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service") + set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}") + set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in") -# install it -install (FILES "${SYSTEMD_USER_FILE}" - DESTINATION "${SYSTEMD_USER_DIR}") + # build it + set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") + configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}") -## -## Upstart systemd override Job File -## + # install it + install (FILES "${SYSTEMD_USER_FILE}" + DESTINATION "${SYSTEMD_USER_DIR}") + + ## + ## Upstart systemd override Job File + ## + + set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart") + message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir") -set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart") -message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir") + install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override" + DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}") -install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override" - DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}") +endif() ## ## Upstart Config File diff --git a/debian/control b/debian/control index e30c760..1033634 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: cmake, libglib2.0-dev (>= 2.36), libgtest-dev, python, - systemd, + systemd [linux-any], Standards-Version: 4.0.0 Homepage: https://github.com/ArcticaProject/ayatana-indicator-session Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-session.git |