cmake: make install prefix path variables more clear

Pointed out by: @rvt

14 files changed, 89 insertions, 89 deletions

diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake
index 958403cc..a78e0ed0 100644
--- a/cmake/opentrack-boilerplate.cmake
+++ b/cmake/opentrack-boilerplate.cmake
@@ -18,10 +18,10 @@ set(new-hier-path "#pragma once
 #endif
 
 #define OPENTRACK_LIBRARY_PREFIX \"\"
-#define OPENTRACK_LIBRARY_PATH \"${opentrack-hier-path}\"
-#define OPENTRACK_DOC_PATH \"${opentrack-hier-doc}\"
-#define OPENTRACK_CONTRIB_PATH \"${opentrack-hier-doc}contrib/\"
-#define OPENTRACK_I18N_PATH \"${opentrack-i18n-path}\"
+#define OPENTRACK_LIBRARY_PATH \"${opentrack-runtime-libexec}\"
+#define OPENTRACK_DOC_PATH \"${opentrack-runtime-doc}\"
+#define OPENTRACK_CONTRIB_PATH \"${opentrack-runtime-doc}contrib/\"
+#define OPENTRACK_I18N_PATH \"${opentrack-runtime-i18n}\"
 ")
 
 function(otr_write_library_paths)
@@ -109,7 +109,7 @@ endfunction()
 
 function(otr_install_pdb_current_project target)
     if(MSVC)
-        install(FILES "$<TARGET_PDB_FILE:${target}>" DESTINATION "${opentrack-hier-debug}" PERMISSIONS ${opentrack-perms-file})
+        install(FILES "$<TARGET_PDB_FILE:${target}>" DESTINATION "${opentrack-debug}" PERMISSIONS ${opentrack-perms-file})
     endif()
 endfunction()
 
@@ -222,20 +222,20 @@ function(otr_module n_)
         if(arg_BIN)
             if (APPLE)
                 install(TARGETS "${n}"
-                RUNTIME DESTINATION ${opentrack-hier-bin}
-                BUNDLE	DESTINATION ${opentrack-hier-bin}
-                LIBRARY DESTINATION ${opentrack-hier-bin}/Library
-                RESOURCE DESTINATION ${opentrack-hier-bin}/opentrack.app/Resource
+                RUNTIME DESTINATION ${opentrack-bin}
+                BUNDLE	DESTINATION ${opentrack-bin}
+                LIBRARY DESTINATION ${opentrack-bin}/Library
+                RESOURCE DESTINATION ${opentrack-bin}/opentrack.app/Resource
                 PERMISSIONS ${opentrack-perms-exec})
             else()
                 install(TARGETS "${n}"
-                    RUNTIME DESTINATION ${opentrack-hier-bin}
-                    LIBRARY DESTINATION ${opentrack-hier-pfx}
+                    RUNTIME DESTINATION ${opentrack-bin}
+                    LIBRARY DESTINATION ${opentrack-libexec}
                     PERMISSIONS ${opentrack-perms-exec})
             endif()
         else()
             # Plugins
-            install(TARGETS "${n}" ${opentrack-hier-str}
+            install(TARGETS "${n}" ${opentrack-install-src}
                     PERMISSIONS ${opentrack-perms-exec})
         endif()
 
@@ -295,7 +295,7 @@ function(otr_install_lib target dest)
                 set(pdb-path "")
                 otr_pdb_for_dll(pdb-path "${path}")
                 if(pdb-path)
-                    install(FILES "${pdb-path}" DESTINATION "${opentrack-hier-debug}" PERMISSIONS ${opentrack-perms-exec})
+                    install(FILES "${pdb-path}" DESTINATION "${opentrack-debug}" PERMISSIONS ${opentrack-perms-exec})
                 endif()
             endif()
             install(FILES "${path}" DESTINATION "${dest}" PERMISSIONS ${opentrack-perms-exec})
diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake
index 13f876a5..16694d1f 100644
--- a/cmake/opentrack-hier.cmake
+++ b/cmake/opentrack-hier.cmake
@@ -10,45 +10,45 @@
 include_guard(GLOBAL)
 
 if(APPLE)
-    set(opentrack-hier-pfx "Plugins")
-    set(opentrack-hier-path "/Plugins/")                        # MUST HAVE A TRAILING BACKSLASH, Used in APP
-    set(opentrack-hier-doc "/")                         # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-bin "${CMAKE_INSTALL_PREFIX}")
-    set(opentrack-doc-pfx "./doc")
-    set(opentrack-doc-src-pfx "./source-code")
-    set(opentrack-i18n-pfx "opentrack.app/Contents/Resources") # used during install
-    set(opentrack-i18n-path "../Resources/i18n") # used in application
+    set(opentrack-libexec "Plugins")
+    set(opentrack-runtime-libexec "/Plugins/")                        # MUST HAVE A TRAILING BACKSLASH, Used in APP
+    set(opentrack-runtime-doc "/")                         # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-bin "${CMAKE_INSTALL_PREFIX}")
+    set(opentrack-doc "./doc")
+    set(opentrack-src "./source-code")
+    set(opentrack-i18n "opentrack.app/Contents/Resources") # used during install
+    set(opentrack-runtime-i18n "../Resources/i18n") # used in application
     set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/Library")
 elseif(WIN32)
-    set(opentrack-hier-pfx "modules")
-    set(opentrack-hier-path "/${opentrack-hier-pfx}/")  # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-doc "/doc/")                     # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-bin ".")
-    set(opentrack-doc-pfx "./doc")
-    set(opentrack-doc-src-pfx "./source-code")
-    set(opentrack-i18n-pfx "./i18n")
-    set(opentrack-i18n-path "./i18n")
-    set(opentrack-hier-debug "./debug")
+    set(opentrack-libexec "modules")
+    set(opentrack-runtime-libexec "/${opentrack-libexec}/")  # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-runtime-doc "/doc/")                     # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-bin ".")
+    set(opentrack-doc "./doc")
+    set(opentrack-src "./source-code")
+    set(opentrack-i18n "./i18n")
+    set(opentrack-runtime-i18n "./i18n")
+    set(opentrack-debug "./debug")
     set(opentrack-install-rpath "")
 else()
-    set(opentrack-hier-pfx "libexec/opentrack")
-    set(opentrack-hier-path "/../${opentrack-hier-pfx}/")   # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-doc "/share/doc/opentrack/")         # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-bin "bin")
-    set(opentrack-doc-pfx "./share/doc/opentrack")
-    set(opentrack-doc-src-pfx "./share/doc/opentrack/source-code")
-    set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-hier-pfx}")
-    set(opentrack-i18n-pfx "./share/opentrack/i18n")
-    set(opentrack-i18n-path "../share/opentrack/i18n")
+    set(opentrack-libexec "libexec/opentrack")
+    set(opentrack-runtime-libexec "/../${opentrack-libexec}/")   # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-runtime-doc "/share/doc/opentrack/")         # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-bin "bin")
+    set(opentrack-doc "./share/doc/opentrack")
+    set(opentrack-src "./share/doc/opentrack/source-code")
+    set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-libexec}")
+    set(opentrack-i18n "./share/opentrack/i18n")
+    set(opentrack-runtime-i18n "../share/opentrack/i18n")
 endif()
-set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx})
+set(opentrack-install-src RUNTIME DESTINATION ${opentrack-libexec} LIBRARY DESTINATION ${opentrack-libexec})
 
 function(otr_escape_string var str)
     string(REGEX REPLACE "([^_A-Za-z0-9./:-])" "\\\\\\1" str "${str}")
     set(${var} "${str}" PARENT_SCOPE)
 endfunction()
 
-set(opentrack-contrib-pfx "${opentrack-doc-pfx}/contrib")
+set(opentrack-contrib-pfx "${opentrack-doc}/contrib")
 
 set(opentrack-binary-suffix "")
 if(WIN32)
diff --git a/cmake/opentrack-i18n.cmake b/cmake/opentrack-i18n.cmake
index 398f59a4..f3b53895 100644
--- a/cmake/opentrack-i18n.cmake
+++ b/cmake/opentrack-i18n.cmake
@@ -58,7 +58,7 @@ function(otr_i18n_for_target_directory n)
 endfunction()
 
 function(otr_merge_translations)
-    otr_escape_string(i18n-pfx "${opentrack-i18n-pfx}")
+    otr_escape_string(i18n-pfx "${opentrack-i18n}")
     install(CODE "file(REMOVE_RECURSE \"\${CMAKE_INSTALL_PREFIX}/${i18n-pfx}\")")
 
     foreach(i ${opentrack_all-translations})
@@ -92,7 +92,7 @@ function(otr_merge_translations)
         add_dependencies(i18n-lrelease ${target-name})
 
         install(FILES "${qm-output}"
-                DESTINATION "${CMAKE_INSTALL_PREFIX}/${opentrack-i18n-pfx}"
+                DESTINATION "${CMAKE_INSTALL_PREFIX}/${opentrack-i18n}"
                 PERMISSIONS ${opentrack-perms-file})
     endforeach()
 endfunction()
diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake
index d464936c..94f3e29d 100644
--- a/cmake/opentrack-install.cmake
+++ b/cmake/opentrack-install.cmake
@@ -17,8 +17,8 @@ macro(otr_install_dir path)
 endmacro()
 
 function(otr_setup_refresh_install_dir)
-    if((NOT CMAKE_INSTALL_PREFIX STREQUAL "") AND (NOT opentrack-doc-src-pfx STREQUAL ""))
-        otr_escape_string(dir "${CMAKE_INSTALL_PREFIX}/${opentrack-doc-src-pfx}/")
+    if((NOT CMAKE_INSTALL_PREFIX STREQUAL "") AND (NOT opentrack-src STREQUAL ""))
+        otr_escape_string(dir "${CMAKE_INSTALL_PREFIX}/${opentrack-src}/")
         install(CODE "file(REMOVE_RECURSE \"${dir}\")")
     endif()
 endfunction()
@@ -28,18 +28,18 @@ function(otr_install_sources)
     get_property(source-dirs GLOBAL PROPERTY opentrack-all-source-dirs)
     foreach(k ${source-dirs})
         file(RELATIVE_PATH dest "${CMAKE_SOURCE_DIR}" "${k}")
-        otr_install_dir("${opentrack-doc-src-pfx}" "${dest}")
+        otr_install_dir("${opentrack-src}" "${dest}")
     endforeach()
 
-    otr_install_dir("${opentrack-doc-src-pfx}" "${CMAKE_SOURCE_DIR}/cmake")
-    otr_install_dir("${opentrack-doc-src-pfx}" "${CMAKE_SOURCE_DIR}/bin")
+    otr_install_dir("${opentrack-src}" "${CMAKE_SOURCE_DIR}/cmake")
+    otr_install_dir("${opentrack-src}" "${CMAKE_SOURCE_DIR}/bin")
 
-    otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/CMakeLists.txt")
-    otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/README.md")
-    otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md")
-    otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt")
-    otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt")
-    otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md")
+    otr_install_misc("${opentrack-src}" FILES "${CMAKE_SOURCE_DIR}/CMakeLists.txt")
+    otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/README.md")
+    otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md")
+    otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt")
+    otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt")
+    otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md")
 endfunction()
 
 function(cleanup_visual_studio_debug)
@@ -47,22 +47,22 @@ function(cleanup_visual_studio_debug)
     install(CODE "file(REMOVE_RECURSE \"${pfx}/.vs\")")
 endfunction()
 
-otr_install_dir("${opentrack-doc-pfx}" ${CMAKE_SOURCE_DIR}/3rdparty-notices)
-otr_install_dir("${opentrack-doc-pfx}" "${CMAKE_SOURCE_DIR}/settings" "${CMAKE_SOURCE_DIR}/contrib")
+otr_install_dir("${opentrack-doc}" ${CMAKE_SOURCE_DIR}/3rdparty-notices)
+otr_install_dir("${opentrack-doc}" "${CMAKE_SOURCE_DIR}/settings" "${CMAKE_SOURCE_DIR}/contrib")
 
 if(WIN32)
     otr_install_misc(. FILES "${CMAKE_SOURCE_DIR}/bin/qt.conf")
     otr_install_misc(. FILES "${CMAKE_SOURCE_DIR}/bin/cleye.config")
-    otr_install_misc(${opentrack-hier-pfx} FILES "${CMAKE_SOURCE_DIR}/bin/cleye.config")
+    otr_install_misc(${opentrack-libexec} FILES "${CMAKE_SOURCE_DIR}/bin/cleye.config")
 endif()
 
-otr_install_misc("${opentrack-doc-pfx}" FILES ${CMAKE_SOURCE_DIR}/README.md)
+otr_install_misc("${opentrack-doc}" FILES ${CMAKE_SOURCE_DIR}/README.md)
 
-otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/README.md")
-otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md")
-otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt")
-otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt")
-otr_install_misc("${opentrack-doc-pfx}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md")
+otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/README.md")
+otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md")
+otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt")
+otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt")
+otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md")
 
 # this must be done last because the files may be in use already
 # do it last so in case of file-in-use failure, the rest is installed
@@ -75,9 +75,9 @@ endif()
 if (APPLE)
     set(OSX_POST_INSTALL_DIR "/../thirdparty")
 endif()
-otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll")
-otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll")
-otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES
+otr_install_exec("${opentrack-libexec}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll")
+otr_install_exec("${opentrack-libexec}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll")
+otr_install_exec("${opentrack-libexec}${OSX_POST_INSTALL_DIR}" FILES
     "${CMAKE_SOURCE_DIR}/bin/NPClient.dll"
     "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll"
     "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe")
diff --git a/cmake/opentrack-opencv.cmake b/cmake/opentrack-opencv.cmake
index b8c3701c..40356418 100644
--- a/cmake/opentrack-opencv.cmake
+++ b/cmake/opentrack-opencv.cmake
@@ -5,7 +5,7 @@ find_package(OpenCV QUIET)
 
 function(otr_install_opencv_libs)
     foreach(k core features2d calib3d flann imgcodecs imgproc videoio)
-        otr_install_lib("opencv_${k}" "${opentrack-hier-pfx}")
+        otr_install_lib("opencv_${k}" "${opentrack-libexec}")
     endforeach()
 endfunction()
 
diff --git a/proto-vjoystick/CMakeLists.txt b/proto-vjoystick/CMakeLists.txt
index 3dbf5bea..5b6a1f07 100644
--- a/proto-vjoystick/CMakeLists.txt
+++ b/proto-vjoystick/CMakeLists.txt
@@ -11,6 +11,6 @@ if(WIN32 AND opentrack-intel)
         otr_module(proto-vjoy)
         target_link_libraries(opentrack-proto-vjoy ${lib})
         target_include_directories(opentrack-proto-vjoy SYSTEM PUBLIC "${SDK_VJOYSTICK}/inc")
-        install(FILES "${dll}" DESTINATION ${opentrack-hier-pfx})
+        install(FILES "${dll}" DESTINATION ${opentrack-libexec})
     endif()
 endif()
diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt
index b0f18bb2..0beb50e1 100644
--- a/proto-wine/CMakeLists.txt
+++ b/proto-wine/CMakeLists.txt
@@ -16,7 +16,7 @@ if(NOT WIN32)
                 set(my-rt)
             endif()
             file(GLOB wine-deps "${CMAKE_CURRENT_SOURCE_DIR}/*.cxx")
-            #install(FILES ${wine-deps} DESTINATION "${opentrack-doc-src-pfx}/proto-wine")
+            #install(FILES ${wine-deps} DESTINATION "${opentrack-src}/proto-wine")
             add_custom_command(
               OUTPUT opentrack-wrapper-wine.exe.so
               DEPENDS ${wine-deps}
@@ -27,7 +27,7 @@ if(NOT WIN32)
             add_custom_target(wine-wrapper DEPENDS opentrack-wrapper-wine.exe.so)
             add_dependencies(opentrack-proto-wine wine-wrapper)
             add_dependencies(wine-wrapper opentrack-compat)
-            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/opentrack-wrapper-wine.exe.so" DESTINATION ${opentrack-hier-pfx})
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/opentrack-wrapper-wine.exe.so" DESTINATION ${opentrack-libexec})
         endif()
     endif()
 endif()
diff --git a/tracker-aruco/CMakeLists.txt b/tracker-aruco/CMakeLists.txt
index 69fe7aa1..d3c1f28c 100644
--- a/tracker-aruco/CMakeLists.txt
+++ b/tracker-aruco/CMakeLists.txt
@@ -29,7 +29,7 @@ if(OpenCV_FOUND)
         endif()
 
         maybe_add_static_define()
-        otr_install_lib("${SDK_ARUCO_LIBPATH}" "${opentrack-hier-pfx}")
+        otr_install_lib("${SDK_ARUCO_LIBPATH}" "${opentrack-libexec}")
 
         otr_module(tracker-aruco)
         target_include_directories(${self} SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS} "${dir}")
diff --git a/tracker-easy/CMakeLists.txt b/tracker-easy/CMakeLists.txt
index 670b9003..c377dd9c 100644
--- a/tracker-easy/CMakeLists.txt
+++ b/tracker-easy/CMakeLists.txt
@@ -9,7 +9,7 @@ if(OpenCV_FOUND)
                 OUTPUT_VARIABLE krap)
     if(tracker-easy_ocv-check)
         foreach(k video highgui)
-            otr_install_lib("opencv_${k}" "${opentrack-hier-pfx}")
+            otr_install_lib("opencv_${k}" "${opentrack-libexec}")
         endforeach()
 
         if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/tracker-hydra/CMakeLists.txt b/tracker-hydra/CMakeLists.txt
index b99c1d7a..48471765 100644
--- a/tracker-hydra/CMakeLists.txt
+++ b/tracker-hydra/CMakeLists.txt
@@ -22,7 +22,7 @@ if(SDK_HYDRA AND opentrack-intel)
         endif()
         set(lib "${SDK_HYDRA}/${dir}/${part}/release_dll/sixense${six4}.${ext}")
         set(dll "${SDK_HYDRA}/bin/${part}/release_dll/sixense${six4}.dll")
-        install(FILES "${dll}" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec})
+        install(FILES "${dll}" DESTINATION ${opentrack-libexec} PERMISSIONS ${opentrack-perms-exec})
         target_link_libraries(opentrack-tracker-hydra "${lib}")
     else()
         if(APPLE)
@@ -31,13 +31,13 @@ if(SDK_HYDRA AND opentrack-intel)
             set(soext "dylib")
             set(plat "osx")
         else() # assume Linux
-            set(dest "${opentrack-hier-pfx}")
+            set(dest "${opentrack-libexec}")
             set(part "release")
             set(soext "so")
             set(plat "linux")
         endif()
         set(lib "libsixense${six4}.${soext}")
         target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}")
-        install(FILES "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec})
+        install(FILES "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}" DESTINATION ${opentrack-libexec} PERMISSIONS ${opentrack-perms-exec})
     endif()
 endif()
diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index 7ab62df2..0a110e5a 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -30,14 +30,14 @@ if (WIN32 AND opentrack-intel)
 		target_link_libraries(${self} opentrack-video)
 
 		# Install Kinect Face DLL
-		install(FILES "${SDK_KINECT20}/Redist/Face/${kinect-arch-dir}/Kinect20.Face.dll" DESTINATION "${opentrack-hier-pfx}" PERMISSIONS ${opentrack-perms-exec})
+		install(FILES "${SDK_KINECT20}/Redist/Face/${kinect-arch-dir}/Kinect20.Face.dll" DESTINATION "${opentrack-libexec}" PERMISSIONS ${opentrack-perms-exec})
 		# Install Kinect Face Database
-		install(DIRECTORY "${SDK_KINECT20}/Redist/Face/${kinect-arch-dir}/NuiDatabase" DESTINATION "${opentrack-hier-pfx}")
+		install(DIRECTORY "${SDK_KINECT20}/Redist/Face/${kinect-arch-dir}/NuiDatabase" DESTINATION "${opentrack-libexec}")
 
 		set(redist-dir "${CMAKE_SOURCE_DIR}/redist/${kinect-arch-dir}")
 		install(
 		  FILES "${redist-dir}/msvcp110.dll" "${redist-dir}/msvcr110.dll"
-		  DESTINATION "${opentrack-hier-pfx}"
+		  DESTINATION "${opentrack-libexec}"
 		  PERMISSIONS ${opentrack-perms-exec}
 		)
 
diff --git a/tracker-steamvr/CMakeLists.txt b/tracker-steamvr/CMakeLists.txt
index dc487cba..eb8b20b9 100644
--- a/tracker-steamvr/CMakeLists.txt
+++ b/tracker-steamvr/CMakeLists.txt
@@ -38,7 +38,7 @@ if(steamvr-dll AND opentrack-intel)
     SET(SDK_VALVE_STEAMVR "" CACHE PATH "Valve's SteamVR")
     if(SDK_VALVE_STEAMVR)
         otr_module(tracker-steamvr)
-        install(FILES "${SDK_VALVE_STEAMVR}/bin/${steamvr-dir}/${steamvr-dll}" DESTINATION "${opentrack-hier-pfx}")
+        install(FILES "${SDK_VALVE_STEAMVR}/bin/${steamvr-dir}/${steamvr-dll}" DESTINATION "${opentrack-libexec}")
 
         target_include_directories(opentrack-tracker-steamvr SYSTEM PRIVATE "${SDK_VALVE_STEAMVR}/headers")
         target_link_libraries(opentrack-tracker-steamvr "${SDK_VALVE_STEAMVR}/lib/${steamvr-dir}/${steamvr-lib}")
diff --git a/video-ps3eye/CMakeLists.txt b/video-ps3eye/CMakeLists.txt
index 888c4fc7..5f81b3fb 100644
--- a/video-ps3eye/CMakeLists.txt
+++ b/video-ps3eye/CMakeLists.txt
@@ -22,13 +22,13 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ps3eye-driver/CMakeLists.txt")
 endif()
 
 if(TARGET ps3eye-sdl)
-    install(TARGETS "ps3eye-sdl" DESTINATION "${opentrack-hier-pfx}")
+    install(TARGETS "ps3eye-sdl" DESTINATION "${opentrack-libexec}")
     if(WIN32)
         foreach(k ${SDL2_LIBRARIES})
             get_filename_component(path "${k}" PATH)
             set(lib "${path}/SDL2.dll")
             if(EXISTS "${lib}")
-                otr_install_lib("${lib}" "${opentrack-hier-pfx}")
+                otr_install_lib("${lib}" "${opentrack-libexec}")
                 break()
             endif()
         endforeach()
@@ -36,7 +36,7 @@ if(TARGET ps3eye-sdl)
 endif()
 
 if(TARGET ps3eye-mode-test)
-    install(TARGETS "ps3eye-mode-test" DESTINATION "${opentrack-hier-pfx}")
+    install(TARGETS "ps3eye-mode-test" DESTINATION "${opentrack-libexec}")
 endif()
 
 if(TARGET ps3eye-driver)
@@ -44,7 +44,7 @@ if(TARGET ps3eye-driver)
     if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
         target_link_libraries(ps3eye-subprocess rt ps3eye-driver)
     endif()
-    install(TARGETS "ps3eye-subprocess" DESTINATION "${opentrack-hier-pfx}")
+    install(TARGETS "ps3eye-subprocess" DESTINATION "${opentrack-libexec}")
 endif()
 
 if(TARGET ps3eye-subprocess)
@@ -53,11 +53,11 @@ if(TARGET ps3eye-subprocess)
     if(WIN32)
         set(path "${SDK_LIBUSB}/libusb-1.0.dll")
         if(EXISTS "${path}")
-            otr_install_lib("${path}" "${opentrack-hier-pfx}")
+            otr_install_lib("${path}" "${opentrack-libexec}")
         endif()
     endif()
 endif()
 
 if(TARGET ps3eye-frame-test)
-    install(TARGETS "ps3eye-frame-test" DESTINATION "${opentrack-hier-pfx}")
+    install(TARGETS "ps3eye-frame-test" DESTINATION "${opentrack-libexec}")
 endif()
diff --git a/x-plane-plugin/CMakeLists.txt b/x-plane-plugin/CMakeLists.txt
index 54bcaf34..8e8fb338 100644
--- a/x-plane-plugin/CMakeLists.txt
+++ b/x-plane-plugin/CMakeLists.txt
@@ -8,7 +8,7 @@ if(LINUX OR APPLE)
             otr_module(xplane-plugin NO-QT)
         endif()
         # probably librt already included
-        #install(FILES ${opentrack-xplane-plugin-c} DESTINATION "opentrack-hier-pfx")
+        #install(FILES ${opentrack-xplane-plugin-c} DESTINATION "opentrack-libexec")
         target_include_directories(opentrack-xplane-plugin SYSTEM PUBLIC ${SDK_XPLANE}/CHeaders/XPLM)
 
         if(APPLE)
@@ -21,9 +21,9 @@ if(LINUX OR APPLE)
                                 -framework XPLM)
                                 
            install(TARGETS "${self}"
-                RUNTIME DESTINATION ${opentrack-hier-bin}/xplane
-                BUNDLE	DESTINATION ${opentrack-hier-bin}/xplane
-                LIBRARY DESTINATION ${opentrack-hier-bin}/xplane 
+                RUNTIME DESTINATION ${opentrack-bin}/xplane
+                BUNDLE	DESTINATION ${opentrack-bin}/xplane
+                LIBRARY DESTINATION ${opentrack-bin}/xplane 
                 PERMISSIONS ${opentrack-perms-exec})
 
         elseif(CMAKE_COMPILER_IS_GNUCXX)