From 477dc6fa22bcd37b23deb45b57bec6518ba52ad9 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 1 Jul 2013 19:02:47 -0500
Subject: in the cmake files, prefer the _FULL versions of the GNU variables

---
 CMakeLists.txt           | 4 ++--
 cmake/UseGSettings.cmake | 2 +-
 data/CMakeLists.txt      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 593d916..25c2be1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,8 +46,8 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
 
 # Workaround for libexecdir on debian
 if (EXISTS "/etc/debian_version") 
-  set (CMAKE_INSTALL_LIBEXECDIR ${CMAKE_INSTALL_LIBDIR})
-  set (CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
+  set (CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}")
+  set (CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
 endif ()
 set (PROJECT_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 message (STATUS "${PROJECT_LIBEXECDIR} is the libexec install dir")
diff --git a/cmake/UseGSettings.cmake b/cmake/UseGSettings.cmake
index 4050b53..3b61523 100644
--- a/cmake/UseGSettings.cmake
+++ b/cmake/UseGSettings.cmake
@@ -3,7 +3,7 @@
 macro(add_schema SCHEMA_NAME)
 
     set(PKG_CONFIG_EXECUTABLE pkg-config)
-    set(GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas")
+    set(GSETTINGS_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/glib-2.0/schemas")
 
     # Run the validator and error if it fails
     execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_compile_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 335582c..3ddf422 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -19,7 +19,7 @@ add_schema (${SCHEMA_FILE})
 ##
 
 # where to install
-set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/dbus-1/services")
+set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
 message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
 
 set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
@@ -40,7 +40,7 @@ install (FILES "${SERVICE_FILE}"
 ##
 
 # where to install
-set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_PREFIX}/share/unity/indicators")
+set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
 message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
 
 set (UNITY_INDICATOR_NAME "com.canonical.indicator.session")
-- 
cgit v1.2.3