diff options
| author | d3x0r <d3x0r@users.noreply.github.com> | 2017-07-06 23:11:11 -0700 |
|---|---|---|
| committer | d3x0r <d3x0r@users.noreply.github.com> | 2017-07-06 23:11:11 -0700 |
| commit | a4d80ca56acc05b92be6015a50cae3d46f081440 (patch) | |
| tree | 8766676bb4d08cffc7eff748b76c6e0530892b76 /apps/openssl | |
| parent | 2557dd7439806448ad41b7bc5f175f4ed4f74d9c (diff) | |
| parent | 334245374a084ba175225c209ac9e18af5a60150 (diff) | |
| download | portable-a4d80ca56acc05b92be6015a50cae3d46f081440.tar.gz portable-a4d80ca56acc05b92be6015a50cae3d46f081440.tar.bz2 portable-a4d80ca56acc05b92be6015a50cae3d46f081440.zip | |
Merge branch 'master' of https://github.com/libressl-portable/portable into SkipInstall
Fix merge conflicts from GNUInstallDirs merge to master.
Diffstat (limited to 'apps/openssl')
| -rw-r--r-- | apps/openssl/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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}) | |||
| 77 | target_link_libraries(openssl ${OPENSSL_LIBS}) | 77 | target_link_libraries(openssl ${OPENSSL_LIBS}) |
| 78 | 78 | ||
| 79 | if(ENABLE_LIBRESSL_INSTALL) | 79 | if(ENABLE_LIBRESSL_INSTALL) |
| 80 | install(TARGETS openssl DESTINATION bin) | 80 | install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 81 | install(FILES openssl.1 DESTINATION share/man/man1) | 81 | install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
| 82 | endif(ENABLE_LIBRESSL_INSTALL) | 82 | endif(ENABLE_LIBRESSL_INSTALL) |
| 83 | 83 | ||
| 84 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 84 | if(NOT "${OPENSSLDIR}" STREQUAL "") |