diff options
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | data/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | data/unity7.conf.in (renamed from unity7.conf.in) | 2 | ||||
| -rw-r--r-- | data/unity7.override (renamed from unity7.override) | 0 | ||||
| -rw-r--r-- | data/unity7.service.in (renamed from unity7.service.in) | 2 |
5 files changed, 13 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c14aa4674..5e97af92b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,19 +425,3 @@ if (DOXYGEN_FOUND STREQUAL "YES") ADDITIONAL_MAKE_CLEAN_FILES api-doc) endif (DOXYGEN_FOUND STREQUAL "YES") - -# -# Upstart -# - -configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions) - -# -# Systemd -# - -configure_file(unity7.service.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.service @ONLY) -pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.service DESTINATION ${SYSTEMD_USER_DIR}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/unity7.override DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/systemd-session/upstart) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 321867659..7ee17122f 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1 +1,11 @@ -add_subdirectory(pam) \ No newline at end of file +add_subdirectory(pam) + +# Upstart +configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions) + +# Systemd +configure_file(unity7.service.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.service @ONLY) +pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.service DESTINATION ${SYSTEMD_USER_DIR}) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/unity7.override DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/systemd-session/upstart) diff --git a/unity7.conf.in b/data/unity7.conf.in index 10ac4029c..1ea63959f 100644 --- a/unity7.conf.in +++ b/data/unity7.conf.in @@ -4,7 +4,7 @@ author "Ted Gould <ted@ubuntu.com>, Marco Trevisan <marco@ubuntu.com>" start on xsession SESSION=ubuntu and started unity-settings-daemon stop on desktop-end -pre-start exec @CMAKE_INSTALL_FULL_LIBDIR@/unity-compiz-profile-select +pre-start exec @UNITY_LIBDIR@/unity-compiz-profile-select respawn exec compiz diff --git a/unity7.override b/data/unity7.override index 2905494b6..2905494b6 100644 --- a/unity7.override +++ b/data/unity7.override diff --git a/unity7.service.in b/data/unity7.service.in index 374d6558b..227c8d0f7 100644 --- a/unity7.service.in +++ b/data/unity7.service.in @@ -7,5 +7,5 @@ PartOf=graphical-session.target [Service] ExecStart=/usr/bin/compiz -ExecStartPre=@CMAKE_INSTALL_FULL_LIBDIR@/unity-compiz-profile-select +ExecStartPre=@UNITYLIBDIR@/unity-compiz-profile-select Restart=on-failure |