Separate wrappers/ and scripts/ under <prefix>/lib/apitrace

We now define a new APITRACE_SCRIPTS_INSTALL_DIR:

	<prefix>/lib/apitrace/scripts

where scripts will soon be installed (as needed).

Meanwhile, APITRACE_WRAPPER_INSTALL_DIR is updated to:

	<prefix>/lib/apitrace/$arch/wrappers

(where before it didn't have the final "wrappers" directory).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87aac12e9482bcd1d151fce4f20671b59f1892ad..9721cdc3e6c653a7f2ae0ea7de203c43522b6fde 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,14 +191,19 @@ else ()
     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
 endif ()
 
+set (LIB_INSTALL_DIR lib/apitrace)
+
 if (APPLE)
     # MacOSX uses fat binaries, so no need to have per-architecture wrapper
     # directories
-    set (WRAPPER_INSTALL_DIR lib/apitrace)
+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
 else ()
-    set (WRAPPER_INSTALL_DIR lib/apitrace/${CMAKE_SYSTEM_PROCESSOR})
+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}/${CMAKE_SYSTEM_PROCESSOR})
 endif ()
 
+set(SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)
+set(WRAPPER_INSTALL_DIR ${LIB_ARCH_INSTALL_DIR}/wrappers)
+
 # Expose the binary/install directories to source
 #
 # TODO: Use the same directory layout, for both build and install directories,
@@ -207,6 +212,7 @@ endif ()
 add_definitions(
     -DAPITRACE_BINARY_DIR="${CMAKE_BINARY_DIR}"
     -DAPITRACE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
+    -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
     -DAPITRACE_WRAPPER_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
 )