From 75073d0a8478441cc97a6efa10b566c5fb1dac81 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 17 Apr 2020 20:57:17 +0100
Subject: New upstream version 1.4.0

---
 man/CMakeLists.txt | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'man/CMakeLists.txt')

diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index c903ab8..44e4a96 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -5,7 +5,7 @@
 find_program(MANDOC_PATH mandoc)
 message(STATUS "MANDOC_PATH: ${MANDOC_PATH}")
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	find_program(GZIP_PATH gzip)
 	message(STATUS "GZIP_PATH: ${GZIP_PATH}")
 endif()
@@ -101,6 +101,7 @@ list(APPEND MAN_ALIAS
 	fido_cbor_info_new fido_cbor_info_extensions_ptr 
 	fido_cbor_info_new fido_cbor_info_free 
 	fido_cbor_info_new fido_cbor_info_maxmsgsiz
+	fido_cbor_info_new fido_cbor_info_fwversion
 	fido_cbor_info_new fido_cbor_info_options_len 
 	fido_cbor_info_new fido_cbor_info_options_name_ptr 
 	fido_cbor_info_new fido_cbor_info_options_value_ptr 
@@ -117,6 +118,7 @@ list(APPEND MAN_ALIAS
 	fido_cred_new fido_cred_free
 	fido_cred_new fido_cred_id_len
 	fido_cred_new fido_cred_id_ptr
+	fido_cred_new fido_cred_prot
 	fido_cred_new fido_cred_pubkey_len
 	fido_cred_new fido_cred_pubkey_ptr
 	fido_cred_new fido_cred_sig_len
@@ -145,6 +147,7 @@ list(APPEND MAN_ALIAS
 	fido_cred_set_authdata fido_cred_set_clientdata_hash
 	fido_cred_set_authdata fido_cred_set_extensions
 	fido_cred_set_authdata fido_cred_set_fmt
+	fido_cred_set_authdata fido_cred_set_prot
 	fido_cred_set_authdata fido_cred_set_rk
 	fido_cred_set_authdata fido_cred_set_rp
 	fido_cred_set_authdata fido_cred_set_sig
@@ -261,17 +264,17 @@ if(MANDOC_PATH)
 	add_dependencies(man man_symlink_html)
 	add_dependencies(man_gzip man_lint)
 	install(FILES ${CMAKE_SOURCE_DIR}/man/style.css
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/libfido2)
+		DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
 	foreach(f ${MAN_SOURCES})
 		string(REGEX REPLACE ".[13]" "" f ${f})
 		install(FILES ${CMAKE_BINARY_DIR}/man/${f}.html
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/libfido2)
+			DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
 	endforeach()
 	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
 		math(EXPR j "${i} + 1")
 		list(GET MAN_ALIAS ${j} DST)
 		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.html
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/libfido2)
+			DESTINATION "${CMAKE_INSTALL_DOCDIR}/html")
 	endforeach()
 endif()
 
@@ -282,33 +285,33 @@ if(GZIP_PATH)
 	foreach(f ${MAN_SOURCES})
 		if (${f} MATCHES ".1$")
 			install(FILES ${CMAKE_BINARY_DIR}/man/${f}.gz
-				DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
 		elseif(${f} MATCHES ".3$")
 			install(FILES ${CMAKE_BINARY_DIR}/man/${f}.gz
-				DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man3")
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
 		endif()
 	endforeach()
 	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
 		math(EXPR j "${i} + 1")
 		list(GET MAN_ALIAS ${j} DST)
 		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3.gz
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man3)
+			DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
 	endforeach()
 elseif(NOT MSVC)
 	add_dependencies(man man_symlink)
 	foreach(f ${MAN_SOURCES})
 		if (${f} MATCHES ".1$")
 			install(FILES ${CMAKE_BINARY_DIR}/man/${f}
-				DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
 		elseif(${f} MATCHES ".3$")
 			install(FILES ${CMAKE_BINARY_DIR}/man/${f}
-				DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man3")
+				DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
 		endif()
 	endforeach()
 	foreach(i RANGE 0 ${MAN_ALIAS_MAX} 2)
 		math(EXPR j "${i} + 1")
 		list(GET MAN_ALIAS ${j} DST)
 		install(FILES ${CMAKE_BINARY_DIR}/man/${DST}.3
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man3)
+			DESTINATION "${CMAKE_INSTALL_MANDIR}/man3")
 	endforeach()
 endif()
-- 
cgit v1.2.3