diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | debian/unity.install | 5 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | tools/unity-compiz-profile-select.in (renamed from tools/unity-compiz-profile.in) | 0 | ||||
| -rw-r--r-- | unity7.conf.in | 2 | ||||
| -rw-r--r-- | unity7.service.in | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 225fc8e3a..c14aa4674 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -430,14 +430,14 @@ endif (DOXYGEN_FOUND STREQUAL "YES") # Upstart # -configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf) +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) +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/debian/unity.install b/debian/unity.install index 701b6b0b1..99c66a076 100644 --- a/debian/unity.install +++ b/debian/unity.install @@ -2,10 +2,9 @@ etc/pam.d usr/bin usr/lib/*/compiz/libunity*.so usr/lib/*/unity -usr/share/unity/unity-compiz-profile usr/share/man/*/unity.1 usr/share/compiz usr/share/locale usr/share/upstart/sessions/unity7.conf -debian/unity7.service usr/lib/systemd/user -debian/unity7.override usr/share/upstart/systemd-session/upstart +usr/lib/systemd/user/unity7.service +usr/share/upstart/systemd-session/upstart/unity7.override diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 266af451c..cd2eb0c91 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -29,5 +29,5 @@ add_executable(unity-active-plugins-safety-check unity_active_plugins_safety_che target_link_libraries(unity-active-plugins-safety-check ${LIBS}) install(TARGETS unity-active-plugins-safety-check DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/) -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity-compiz-profile.in ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity-compiz-profile-select.in ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-compiz-profile-select DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/) diff --git a/tools/unity-compiz-profile.in b/tools/unity-compiz-profile-select.in index e3ab7e59c..e3ab7e59c 100755 --- a/tools/unity-compiz-profile.in +++ b/tools/unity-compiz-profile-select.in diff --git a/unity7.conf.in b/unity7.conf.in index f3ab446c1..cd3a8816f 100644 --- a/unity7.conf.in +++ b/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 /usr/share/unity/unity-compiz-profile +pre-start exec @CMAKE_INSTALL_LIBDIR@/unity/unity-compiz-profile-select respawn exec compiz diff --git a/unity7.service.in b/unity7.service.in index edfdfdbb1..cec854387 100644 --- a/unity7.service.in +++ b/unity7.service.in @@ -7,5 +7,5 @@ PartOf=graphical-session.target [Service] ExecStart=/usr/bin/compiz -ExecStart.Pre=/usr/share/unity/unity-compiz-profile +ExecStart.Pre=@CMAKE_INSTALL_LIBDIR@/unity/unity-compiz-profile-select Restart=on-failure |