commit c28b0a17c6f4dce11ad4c42e04aef1b2a1fc38c7
author James Jones <jajones@nvidia.com> Thu Jul 23 17:39:37 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Fri Jul 24 13:08:37 2015 -0600
tree 22ac53fa5dd2070baff84bcacb2212385dc8b658
parent 3869f41a7c31677d4cb5a7070f4802aeb7084a01

linux: Fix standard GNU path usage

The previous attempt at using GNU standard paths
limited searching to the prefix where the loader
was installed.  What we really want though is to
always search in /usr, also search in whatever
local prefix the user installed at if it wasn't
/usr, and use the standard GNU libdir, sysconfdir,
and datadir under those prefixes.  This change
implements that behavior.

Signed-off-by: James Jones <jajones@nvidia.com>
Tested-by: Liam Middlebrook <lmiddlebrook@nvidia.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47816fe..442876a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,10 +37,13 @@
 
 if(NOT WIN32)
     include(GNUInstallDirs)
-    add_definitions(-DLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
-    add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-    add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
-
+    add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}")
+    add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_SYSCONFDIR}")
+    add_definitions(-DDATADIR="${CMAKE_INSTALL_DATADIR}")
+    if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+    else()
+        add_definitions(-DLOCALPREFIX="${CMAKE_INSTALL_PREFIX}")
+    endif()
     if(NOT EXISTS ${LUNARGLASS_PREFIX})
         message(FATAL_ERROR "Necessary LunarGLASS components do not exist: " ${LUNARGLASS_PREFIX})
     endif()