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

Fix merge conflicts from GNUInstallDirs merge to master.
This commit is contained in:
d3x0r
2017-07-06 23:11:11 -07:00
11 changed files with 38 additions and 36 deletions

View File

@@ -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 "")