Merge branch 'podsvirov-make-man' into fixes

man/CMakeLists.txt

@@ -4,9 +4,8 @@
 # could not be found, then the man pages will not be built or installed -
 # because the install is optional.
 
-if(NOT WIN32)
-	find_program(XSLTPROC xsltproc OPTIONAL)
-	if(XSLTPROC)
+find_program(XSLTPROC xsltproc OPTIONAL)
+if(XSLTPROC)
 	function(compile_manpage page)
 		add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/man/${page}
 			COMMAND xsltproc ${PROJECT_SOURCE_DIR}/man/${page}.xml -o ${PROJECT_SOURCE_DIR}/man/
@@ -25,13 +24,8 @@ if(NOT WIN32)
 	compile_manpage("mosquitto-tls.7")
 	compile_manpage("mqtt.7")
 	compile_manpage("mosquitto.8")
-	else()
-		message(FATAL_ERROR "xsltproc not found: manpages cannot be built")
-	endif()
-
-endif()
 
-install(FILES
+	install(FILES
 		mosquitto_ctrl.1
 		mosquitto_ctrl_dynsec.1
 		mosquitto_passwd.1
@@ -41,7 +35,14 @@ install(FILES
 		DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
 		OPTIONAL)
 
-install(FILES libmosquitto.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 OPTIONAL)
-install(FILES mosquitto.conf.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5 OPTIONAL)
-install(FILES mosquitto-tls.7 mqtt.7 DESTINATION ${CMAKE_INSTALL_MANDIR}/man7 OPTIONAL)
-install(FILES mosquitto.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8 OPTIONAL)
+	install(FILES libmosquitto.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 OPTIONAL)
+	install(FILES mosquitto.conf.5 DESTINATION ${CMAKE_INSTALL_MANDIR}/man5 OPTIONAL)
+	install(FILES mosquitto-tls.7 mqtt.7 DESTINATION ${CMAKE_INSTALL_MANDIR}/man7 OPTIONAL)
+	install(FILES mosquitto.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8 OPTIONAL)
+
+elseif(WIN32)
+	message(WARNING "xsltproc not found: manpages cannot be built")
+else()
+	message(FATAL_ERROR "xsltproc not found: manpages cannot be built")
+endif()
+