cmake: make install prefix path variables more clear

Pointed out by: @rvt

1 files changed, 28 insertions, 28 deletions

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)