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/nc | |
| 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/nc')
| -rw-r--r-- | apps/nc/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 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}) | |||
| 54 | 54 | ||
| 55 | if(ENABLE_NC) | 55 | if(ENABLE_NC) |
| 56 | if(ENABLE_LIBRESSL_INSTALL) | 56 | if(ENABLE_LIBRESSL_INSTALL) |
| 57 | install(TARGETS nc DESTINATION bin) | 57 | install(TARGETS nc DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 58 | install(FILES nc.1 DESTINATION share/man/man1) | 58 | install(FILES nc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
| 59 | endif(ENABLE_LIBRESSL_INSTALL) | 59 | endif(ENABLE_LIBRESSL_INSTALL) |
| 60 | endif() | 60 | endif() |
| 61 | 61 | ||