Merge branch 'master' of https://github.com/libressl-portable/portable into SkipInstall

Fix merge conflicts from GNUInstallDirs merge to master.

3 files changed, 7 insertions, 6 deletions

diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index 424c676..64d14fa 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -54,8 +54,8 @@ target_link_libraries(nc tls ${OPENSSL_LIBS})
 
 if(ENABLE_NC)
         if(ENABLE_LIBRESSL_INSTALL)
-                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(ENABLE_LIBRESSL_INSTALL)
 endif()
 
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 064c367..af245f4 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -37,8 +37,9 @@ add_executable(ocspcheck ${OCSPCHECK_SRC})
 target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
 
 if(ENABLE_LIBRESSL_INSTALL)
-        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(ENABLE_LIBRESSL_INSTALL)
 
 endif()
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index cf5c852..71fbd63 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -77,8 +77,8 @@ add_executable(openssl ${OPENSSL_SRC})
 target_link_libraries(openssl ${OPENSSL_LIBS})
 
 if(ENABLE_LIBRESSL_INSTALL)
-        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)
 endif(ENABLE_LIBRESSL_INSTALL)
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")