9 files changed, 16 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 570e0ef..dfb3d53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ include(CheckTypeSize)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
 include(cmake_export_symbol)
+include(GNUInstallDirs)
 
 project (LibreSSL C)
 
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index c8757a6..be38146 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -53,8 +53,8 @@ add_executable(nc ${NC_SRC})
 target_link_libraries(nc tls ${OPENSSL_LIBS})
 
 if(ENABLE_NC)
-        install(TARGETS nc DESTINATION bin)
-        install(FILES nc.1 DESTINATION share/man/man1)
+        install(TARGETS nc DESTINATION ${CMAKE_INSTALL_BINDIR})
+        install(FILES nc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 endif()
 
 endif()
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index a14485e..478f232 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
 add_executable(ocspcheck ${OCSPCHECK_SRC})
 target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
 
-install(TARGETS ocspcheck DESTINATION bin)
-install(FILES ocspcheck.8 DESTINATION share/man/man8)
+install(TARGETS ocspcheck DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
 
 endif()
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index 9512065..2e47840 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -76,8 +76,8 @@ endif()
 add_executable(openssl ${OPENSSL_SRC})
 target_link_libraries(openssl ${OPENSSL_LIBS})
 
-install(TARGETS openssl DESTINATION bin)
-install(FILES openssl.1 DESTINATION share/man/man1)
+install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")
         set(CONF_DIR "${OPENSSLDIR}")
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index f8c5684..eca9d1c 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -829,9 +829,9 @@ if (BUILD_SHARED)
                 ARCHIVE_OUTPUT_NAME crypto${CRYPTO_POSTFIX})
         set_target_properties(crypto-shared PROPERTIES VERSION
                 ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
-        install(TARGETS crypto crypto-shared DESTINATION lib)
+        install(TARGETS crypto crypto-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
 else()
         add_library(crypto STATIC ${CRYPTO_SRC})
-        install(TARGETS crypto DESTINATION lib)
+        install(TARGETS crypto DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
 
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 110caa5..ccb6589 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,5 +1,5 @@
 install(DIRECTORY .
-        DESTINATION include
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
         PATTERN "CMakeLists.txt" EXCLUDE
         PATTERN "compat" EXCLUDE
         PATTERN "Makefile*" EXCLUDE)
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index 5923f58..454b1ee 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,9 +1,9 @@
 install(DIRECTORY .
-    DESTINATION share/man/man3
+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man3
     FILES_MATCHING PATTERN "*.3"
     )
 
 install(DIRECTORY .
-    DESTINATION share/man/man1
+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
     FILES_MATCHING PATTERN "*.1"
     )
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index bc2fea4..5403942 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -60,8 +60,8 @@ if (BUILD_SHARED)
                 ARCHIVE_OUTPUT_NAME ssl${SSL_POSTFIX})
         set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION}
                 SOVERSION ${SSL_MAJOR_VERSION})
-        install(TARGETS ssl ssl-shared DESTINATION lib)
+        install(TARGETS ssl ssl-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
 else()
         add_library(ssl STATIC ${SSL_SRC})
-        install(TARGETS ssl DESTINATION lib)
+        install(TARGETS ssl DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index b71fb37..c3e6336 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -39,9 +39,9 @@ if (BUILD_SHARED)
                 ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX})
         set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
                 SOVERSION ${TLS_MAJOR_VERSION})
-        install(TARGETS tls tls-shared DESTINATION lib)
+        install(TARGETS tls tls-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
 else()
         add_library(tls STATIC ${TLS_SRC})
-        install(TARGETS tls DESTINATION lib)
+        install(TARGETS tls DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()