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

Fix merge conflicts from GNUInstallDirs merge to master.
2017-07-06 23:11:11 -07:00
parent 2557dd7439 334245374a
commit a4d80ca56a
11 changed files with 38 additions and 36 deletions
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -1,11 +1,11 @@
 if(ENABLE_LIBRESSL_INSTALL)
 	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"
 	    )
 endif(ENABLE_LIBRESSL_INSTALL)