From 4dd2179f191d1ace113f26177944684fa1561dc1 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 13 Feb 2020 11:32:28 +0100
Subject: [PATCH] Fix remaining install dirs to use GNUInstallDirs consistently

---
 cmake/modules/BasicConfig.cmake   | 2 +-
 cmake/modules/LibraryTarget.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake
index 1413385..82276c6 100644
--- a/cmake/modules/BasicConfig.cmake
+++ b/cmake/modules/BasicConfig.cmake
@@ -184,7 +184,7 @@ if (APPEND_GIT_REVISION)
 endif ()
 
 # set TARGET_EXECUTABLE which is used to refer to the target executable at its installation location
-set(TARGET_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/${META_TARGET_NAME}")
+set(TARGET_EXECUTABLE "${CMAKE_INSTALL_FULL_BINDIR}/${META_TARGET_NAME}")
 
 # create header for feature detection
 if (META_FEATURES_FOR_COMPILER_DETECTION_HEADER)
diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake
index 99f0823..825ea16 100644
--- a/cmake/modules/LibraryTarget.cmake
+++ b/cmake/modules/LibraryTarget.cmake
@@ -540,7 +540,7 @@ if (NOT META_NO_INSTALL_TARGETS AND ENABLE_INSTALL_TARGETS)
             add_custom_target(
                 install-${META_TARGET_NAME}-mingw-w64-importlib-strip
                 COMMAND "${STRIP_BINARY_PATH}" -g
-                        "\$\{DESTDIR\}\$\{DESTDIR:+/\}${CMAKE_INSTALL_PREFIX}/lib/lib${META_TARGET_NAME}.dll.a")
+                        "\$\{DESTDIR\}\$\{DESTDIR:+/\}${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/lib${META_TARGET_NAME}.dll.a")
             add_dependencies(install-${META_TARGET_NAME}-mingw-w64-importlib-strip install-binary-strip)
             add_dependencies(install-mingw-w64-strip install-${META_TARGET_NAME}-mingw-w64-importlib-strip)
         endif ()
@@ -548,7 +548,7 @@ if (NOT META_NO_INSTALL_TARGETS AND ENABLE_INSTALL_TARGETS)
             add_custom_target(
                 install-${META_TARGET_NAME}-mingw-w64-staticlib-strip
                 COMMAND "${STRIP_BINARY_PATH}" -g
-                        "\$\{DESTDIR\}\$\{DESTDIR:+/\}${CMAKE_INSTALL_PREFIX}/lib/lib${META_TARGET_NAME}.a")
+                        "\$\{DESTDIR\}\$\{DESTDIR:+/\}${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/lib${META_TARGET_NAME}.a")
             add_dependencies(install-${META_TARGET_NAME}-mingw-w64-staticlib-strip install-binary-strip)
             add_dependencies(install-mingw-w64-strip install-${META_TARGET_NAME}-mingw-w64-staticlib-strip)
         endif ()