Move `LibreSSL/` to `LIBRESSL_INSTALL_CMAKEDIR`.

This allows users to install the CMake configs without forcing a
`LibreSSL` directory after `LIBRESSL_INSTALL_CMAKEDIR`.

4 files changed, 6 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e26e47..4b34765 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ option(ENABLE_ASM "Enable assembly" ON)
 option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some platforms" OFF)
 option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF)
 set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE)
-set(LIBRESSL_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake" CACHE STRING "Installation directory for the CMake targets")
+set(LIBRESSL_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/LibreSSL" CACHE STRING "Installation directory for the CMake targets")
 
 option(USE_STATIC_MSVC_RUNTIMES "Use /MT instead of /MD in MSVC" OFF)
 if(USE_STATIC_MSVC_RUNTIMES)
@@ -463,12 +463,12 @@ if(ENABLE_LIBRESSL_INSTALL)
         "${CMAKE_CURRENT_LIST_DIR}/LibreSSLConfig.cmake.in"
         "${CMAKE_CURRENT_BINARY_DIR}/install-config/LibreSSLConfig.cmake"
                 PATH_VARS INCLUDE_DIRECTORY
-        INSTALL_DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL"
+        INSTALL_DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
         )
         install(FILES
                 "${CMAKE_BINARY_DIR}/install-config/LibreSSLConfig.cmake"
                 "${CMAKE_BINARY_DIR}/LibreSSLConfigVersion.cmake"
-                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL"
+                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
         )
 endif()
 
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 597ffef..6ff46c8 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1025,7 +1025,7 @@ if(ENABLE_LIBRESSL_INSTALL)
                 EXPORT Crypto-target
                 FILE "LibreSSL-Crypto.cmake"
                 NAMESPACE LibreSSL::
-                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL"
+                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
         )
 endif(ENABLE_LIBRESSL_INSTALL)
 
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 16ef277..9ba2a9e 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -126,7 +126,7 @@ if(ENABLE_LIBRESSL_INSTALL)
                 EXPORT SSL-target
                 FILE "LibreSSL-SSL.cmake"
                 NAMESPACE LibreSSL::
-                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL"
+                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
         )
 endif(ENABLE_LIBRESSL_INSTALL)
 
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index a8f29af..59deee3 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -93,7 +93,7 @@ if(ENABLE_LIBRESSL_INSTALL)
                 EXPORT TLS-target
                 FILE "LibreSSL-TLS.cmake"
                 NAMESPACE LibreSSL::
-                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL"
+                DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
         )
 endif(ENABLE_LIBRESSL_INSTALL)