11 files changed, 23 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2298c7b0..d801620dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,8 +158,9 @@ add_dependencies (release distcheck)
 #
 set (VERSION "${UNITY_VERSION}")
 set (PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
-set (UNITYLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
-set (UNITYDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")
+set (UNITY_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
+set (UNITY_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")
+set (UNITY_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
 set (PKGDATADIR "${UNITYDATADIR}/icons")
 set (SOURCEDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
 set (BUILDDIR "${CMAKE_BINARY_DIR}")
diff --git a/UnityCore/DBusIndicators.cpp b/UnityCore/DBusIndicators.cpp
index 6021418f2..5dade1f57 100644
--- a/UnityCore/DBusIndicators.cpp
+++ b/UnityCore/DBusIndicators.cpp
@@ -123,7 +123,7 @@ void DBusIndicators::Impl::CheckLocalService()
 
 // This is obviously hackish, but this part of the code is mostly hackish...
 // Let's attempt to run it from where we expect it to be
- std::string cmd = UNITYLIBDIR"/" + std::string("unity-panel-service");
+ std::string cmd = UNITY_INSTALL_LIBDIR"/" + std::string("unity-panel-service");
 LOG_WARN(logger) << "Couldn't load panel from installed services, "
 << "so trying to load panel from known location: " << cmd;
 
diff --git a/config.h.cmake b/config.h.cmake
index 11dfa0e5f..3caa2ecde 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -2,8 +2,9 @@
 #define CONFIG_H
 
 #cmakedefine PREFIXPATH "@PREFIXPATH@"
-#cmakedefine UNITYDATADIR "@UNITYDATADIR@"
-#cmakedefine UNITYLIBDIR "@UNITYLIBDIR@"
+#cmakedefine UNITY_DATADIR "@UNITY_DATADIR@"
+#cmakedefine UNITY_LIBDIR "@UNITY_LIBDIR@"
+#cmakedefine UNITY_INSTALL_LIBDIR "@UNITY_INSTALL_LIBDIR@"
 #cmakedefine PKGDATADIR "@PKGDATADIR@"
 #cmakedefine LOCALE_DIR "@LOCALE_DIR@"
 #cmakedefine VERSION "@VERSION@"
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 321867659..bae9119aa 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(pam) \ No newline at end of file
+add_subdirectory(pam)
diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index 13a61716b..46915fea4 100644
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -51,7 +51,7 @@ link_directories(${LIB_PATHS})
 
 add_executable(unity-panel-service ${PANEL_SOURCES})
 target_link_libraries(unity-panel-service ${LIBS})
-install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
+install(TARGETS unity-panel-service DESTINATION ${UNITY_INSTALL_LIBDIR})
 
 configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
diff --git a/services/unity-panel-service-lockscreen.conf.in b/services/unity-panel-service-lockscreen.conf.in
index b9255d825..d9ceb3276 100644
--- a/services/unity-panel-service-lockscreen.conf.in
+++ b/services/unity-panel-service-lockscreen.conf.in
@@ -5,4 +5,4 @@ start on desktop-lock
 stop on desktop-unlock
 
 respawn
-exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode
+exec ${UNITY_LIBDIR}/unity-panel-service --lockscreen-mode
diff --git a/services/unity-panel-service-lockscreen.service.in b/services/unity-panel-service-lockscreen.service.in
new file mode 100644
index 000000000..d1b1eb6ff
--- /dev/null
+++ b/services/unity-panel-service-lockscreen.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=Backing Service for the Unity Panel in Lockscreen mode
+PartOf=unity-screen-locked.target
+
+[Service]
+ExecStart=${UNITY_LIBDIR}/unity-panel-service --lockscreen-mode
+Restart=on-failure
diff --git a/services/unity-panel-service.conf.in b/services/unity-panel-service.conf.in
index 62712f833..5fc3e012b 100644
--- a/services/unity-panel-service.conf.in
+++ b/services/unity-panel-service.conf.in
@@ -15,4 +15,4 @@ emits indicator-services-start
 emits indicator-services-end
 
 respawn
-exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service
+exec ${UNITY_LIBDIR}/unity-panel-service
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 58e575a8d..adc58083f 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
 #
 # Some unity tools
 #
-install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity)
+install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${UNITY_INSTALL_LIBDIR})
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity)
 install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
@@ -27,4 +27,4 @@ link_directories(${LIB_PATHS})
 
 add_executable(unity-active-plugins-safety-check unity_active_plugins_safety_check.cpp)
 target_link_libraries(unity-active-plugins-safety-check ${LIBS})
-install(TARGETS unity-active-plugins-safety-check DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
+install(TARGETS unity-active-plugins-safety-check DESTINATION ${UNITY_INSTALL_LIBDIR})
diff --git a/unity-shared/DashStyle.cpp b/unity-shared/DashStyle.cpp
index 65bbe0c11..66ed48c5b 100755
--- a/unity-shared/DashStyle.cpp
+++ b/unity-shared/DashStyle.cpp
@@ -44,7 +44,7 @@
 #include "UnitySettings.h"
 #include "config.h"
 
-#define DASH_WIDGETS_FILE UNITYDATADIR"/themes/dash-widgets.json"
+#define DASH_WIDGETS_FILE UNITY_DATADIR"/themes/dash-widgets.json"
 
 namespace unity
 {
@@ -303,7 +303,7 @@ void Style::Impl::LoadStyleFile()
 // is initialised.
 SetDefaultValues();
 
- if (!parser.Open(theme::Settings::Get()->ThemedFilePath("dash-widgets", {UNITYDATADIR"/themes"}, {"json"})))
+ if (!parser.Open(theme::Settings::Get()->ThemedFilePath("dash-widgets", {UNITY_DATADIR"/themes"}, {"json"})))
 {
 LOG_ERROR(logger) << "Impossible to find a dash-widgets.json in theme paths";
 return;
diff --git a/unity7.conf.in b/unity7.conf.in
index 2cd42aa72..e465df919 100644
--- a/unity7.conf.in
+++ b/unity7.conf.in
@@ -23,7 +23,7 @@ pre-start script
 initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile"
 export COMPIZ_CONFIG_PROFILE="$compiz_profile"
 
- ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-active-plugins-safety-check
+ ${UNITY_LIBDIR}/unity-active-plugins-safety-check
 end script
 
 respawn