From 6a2f1f9e8f8a9ee4044def16aeff917b675d31e3 Mon Sep 17 00:00:00 2001
From: Michael Graeb <graebm@amazon.com>
Date: Thu, 19 Dec 2024 16:16:20 -0800
Subject: [PATCH] respect custom cmake install path for bin/lib/include

---
 CMakeLists.txt                   | 10 +++++-----
 bin/elastipubsub/CMakeLists.txt  |  4 +---
 bin/elastipubsub5/CMakeLists.txt |  4 +---
 bin/elastishadow/CMakeLists.txt  |  4 +---
 bin/mqtt5canary/CMakeLists.txt   |  4 +---
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ad75959..cfafeba3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,11 +78,11 @@ aws_use_package(aws-c-http)
 target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
 aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
-install(FILES ${AWS_MQTT_HEADERS} DESTINATION "include/aws/mqtt" COMPONENT Development)
-install(FILES ${AWS_MQTT5_HEADERS} DESTINATION "include/aws/mqtt/v5" COMPONENT Development)
-install(FILES ${AWS_MQTT_RR_HEADERS} DESTINATION "include/aws/mqtt/request-response" COMPONENT Development)
-install(FILES ${AWS_MQTT_TESTING_HEADERS} DESTINATION "include/aws/testing/mqtt" COMPONENT Development)
-install(FILES ${AWS_MQTT_PRIV_EXPOSED_HEADERS} DESTINATION "include/aws/mqtt/private" COMPONENT Development)
+install(FILES ${AWS_MQTT_HEADERS} DESTINATION "${INCLUDE_DIRECTORY}/aws/mqtt" COMPONENT Development)
+install(FILES ${AWS_MQTT5_HEADERS} DESTINATION "${INCLUDE_DIRECTORY}/aws/mqtt/v5" COMPONENT Development)
+install(FILES ${AWS_MQTT_RR_HEADERS} DESTINATION "${INCLUDE_DIRECTORY}/aws/mqtt/request-response" COMPONENT Development)
+install(FILES ${AWS_MQTT_TESTING_HEADERS} DESTINATION "${INCLUDE_DIRECTORY}/aws/testing/mqtt" COMPONENT Development)
+install(FILES ${AWS_MQTT_PRIV_EXPOSED_HEADERS} DESTINATION "${INCLUDE_DIRECTORY}/aws/mqtt/private" COMPONENT Development)
 
 if (BUILD_SHARED_LIBS)
     set (TARGET_DIR "shared")
diff --git a/bin/elastipubsub/CMakeLists.txt b/bin/elastipubsub/CMakeLists.txt
index c011697c..ad2475cb 100644
--- a/bin/elastipubsub/CMakeLists.txt
+++ b/bin/elastipubsub/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(elastipubsub C)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
-
 file(GLOB ELASTIPUBSUB_SRC
         "*.c"
         )
@@ -25,5 +23,5 @@ install(TARGETS ${ELASTIPUBSUB_PROJECT_NAME}
         EXPORT ${ELASTIPUBSUB_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${RUNTIME_DIRECTORY}
         COMPONENT Runtime)
diff --git a/bin/elastipubsub5/CMakeLists.txt b/bin/elastipubsub5/CMakeLists.txt
index 4d2f36ba..12121b05 100644
--- a/bin/elastipubsub5/CMakeLists.txt
+++ b/bin/elastipubsub5/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(elastipubsub5 C)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
-
 file(GLOB ELASTIPUBSUB_SRC
         "*.c"
         )
@@ -25,5 +23,5 @@ install(TARGETS ${ELASTIPUBSUB_MQTT5_PROJECT_NAME}
         EXPORT ${ELASTIPUBSUB_MQTT5_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${RUNTIME_DIRECTORY}
         COMPONENT Runtime)
diff --git a/bin/elastishadow/CMakeLists.txt b/bin/elastishadow/CMakeLists.txt
index c86e47c3..356451e5 100644
--- a/bin/elastishadow/CMakeLists.txt
+++ b/bin/elastishadow/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(elastishadow C)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
-
 file(GLOB ELASTISHADOW_SRC
         "*.c"
         )
@@ -25,5 +23,5 @@ install(TARGETS ${ELASTISHADOW_PROJECT_NAME}
         EXPORT ${ELASTISHADOW_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${RUNTIME_DIRECTORY}
         COMPONENT Runtime)
diff --git a/bin/mqtt5canary/CMakeLists.txt b/bin/mqtt5canary/CMakeLists.txt
index fcdd5412..818f7a0f 100644
--- a/bin/mqtt5canary/CMakeLists.txt
+++ b/bin/mqtt5canary/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(mqtt5canary C)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
-
 file(GLOB MQTT5CANARY_SRC
         "*.c"
         )
@@ -25,5 +23,5 @@ install(TARGETS ${MQTT5CANARY_PROJECT_NAME}
         EXPORT ${MQTT5CANARY_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${RUNTIME_DIRECTORY}
         COMPONENT Runtime)