Change non-executable install directories to include an "apitrace" component

It's just more polite to put documentation into
<prefix>/share/doc/apitrace rather than just dumping it into the
top-level <prefix>/doc.

Similarly, since glxtrace.so is not a conventional library, it doesn't
belong in <prefix>/lib but is well-suited for <prefix>/lib/apitrace.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b4ab84f20c1c6e7aa59ba65b42ff97d3a530bdd..8ea59d55642f6d9029343d95563664ef8c21b696 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -380,7 +380,7 @@ else ()
 
     target_link_libraries (glxtrace dl ${X11_X11_LIB})
 
-    install (TARGETS glxtrace LIBRARY DESTINATION lib)
+    install (TARGETS glxtrace LIBRARY DESTINATION lib/apitrace)
 endif ()
 
 
@@ -459,6 +459,12 @@ endif ()
 ##############################################################################
 # Packaging
 
+if (WIN32 OR APPLE)
+    set (INSTALL_DOC_DESTINATION doc)
+else ()
+    set (INSTALL_DOC_DESTINATION share/doc/${CMAKE_PROJECT_NAME})
+endif ()
+
 install (
     FILES
         BUGS.markdown
@@ -466,7 +472,8 @@ install (
         NEWS.markdown
         README.markdown
         TODO.markdown
-    DESTINATION doc)
+    DESTINATION ${INSTALL_DOC_DESTINATION}
+)
 
 set (CPACK_PACKAGE_VERSION_MAJOR "2")
 set (CPACK_PACKAGE_VERSION_MINOR "0")

diff --git a/gui/traceprocess.cpp b/gui/traceprocess.cpp
index d07e400e0091a089d291c76cddd25bbbfecea487..dcf00a7d613d9f7836acb56fdb556aa7bedf281a 100644 (file)
--- a/gui/traceprocess.cpp
+++ b/gui/traceprocess.cpp
@@ -15,12 +15,12 @@ findPreloader()
     if (fi.exists())
         return libPath;
 
-    libPath = QString::fromLatin1("/usr/local/lib/glxtrace.so");
+    libPath = QString::fromLatin1("/usr/local/lib/apitrace/glxtrace.so");
     fi = QFileInfo(libPath);
     if (fi.exists())
         return libPath;
 
-    libPath = QString::fromLatin1("/usr/lib/glxtrace.so");
+    libPath = QString::fromLatin1("/usr/lib/apitrace/glxtrace.so");
     fi = QFileInfo(libPath);
     if (fi.exists())
         return libPath;