[doc,manpage] name manpages versioned

if WITH_BINARY_VERSIONING is activated also version the manpages to match the binary names
2024-11-23 09:54:26 +08:00 · 2023-12-21 19:29:58 +01:00 · 2023-12-21 19:29:58 +01:00 · 7d641a67b9
commit 7d641a67b9
parent b1cb6b3efc
17 changed files with 107 additions and 69 deletions
--- a/client/SDL/man/CMakeLists.txt
+++ b/client/SDL/man/CMakeLists.txt
@ -3,4 +3,9 @@ set(DEPS
        sdl-freerdp-examples.1.xml
        sdl-freerdp-envvar.1.xml
    )
-generate_and_install_freerdp_man_from_xml(sdl-freerdp.1 ${DEPS})
+
+set(MANPAGE_NAME ${PROJECT_NAME})
+if (WITH_BINARY_VERSIONING)
+	set(MANPAGE_NAME ${PROJECT_NAME}${PROJECT_VERSION_MAJOR})
+endif()
+generate_and_install_freerdp_man_from_xml(${PROJECT_NAME}.1 ${MANPAGE_NAME}.1 ${DEPS})
--- a/client/SDL/man/sdl-freerdp.1.xml.in
+++ b/client/SDL/man/sdl-freerdp.1.xml.in
@ -17,21 +17,21 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	</author>
 	</refentryinfo>
 	<refmeta>
-	<refentrytitle>sdl-freerdp</refentrytitle>
+	<refentrytitle>@MANPAGE_NAME@</refentrytitle>
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">freerdp</refmiscinfo>
-	<refmiscinfo class="manual">sdl-freerdp</refmiscinfo>
+	<refmiscinfo class="manual">@MANPAGE_NAME@</refmiscinfo>
 	</refmeta>
 	<refnamediv>
-	<refname><application>sdl-freerdp</application></refname>
-	<refpurpose>FreeRDP X11 client</refpurpose>
+	<refname><application>@MANPAGE_NAME@</application></refname>
+	<refpurpose>FreeRDP SDL client</refpurpose>
 	</refnamediv>
 	<refsynopsisdiv>
 	<refsynopsisdivinfo>
 		<date>@MAN_TODAY@</date>
 	</refsynopsisdivinfo>
 	<para>
-		<command>sdl-freerdp</command> [file] [options] [/v:server[:port]]
+		<command>@MANPAGE_NAME@</command> [file] [options] [/v:server[:port]]
 	</para>
 	</refsynopsisdiv>
 	<refsect1>
@ -40,9 +40,10 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	</refsect1info>
 	<title>DESCRIPTION</title>
 	<para>
-		<command>sdl-freerdp</command> is an X11 Remote Desktop Protocol (RDP)
+		<command>@MANPAGE_NAME@</command> is an SDL Remote Desktop Protocol (RDP)
 		client which is part of the FreeRDP project. An RDP server is built-in
-		to many editions of Windows. Alternative servers included xrdp and VRDP (VirtualBox).
+		to many editions of Windows. Alternative servers included ogon, gnome-remote-desktop,
+		xrdp and VRDP (VirtualBox).
 	</para>
 	</refsect1>

--- a/client/Wayland/CMakeLists.txt
+++ b/client/Wayland/CMakeLists.txt
@ -48,13 +48,15 @@ list (APPEND ${MODULE_PREFIX}_LIBS freerdp-client freerdp uwac)

 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

+set(MANPAGE_NAME ${MODULE_NAME})
 if (WITH_BINARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set(MANPAGE_NAME ${MODULE_NAME}${FREERDP_API_VERSION})
 endif()
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)

 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
-configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)
+configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1)
+install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1 1)
--- a/client/Wayland/wlfreerdp.1.in
+++ b/client/Wayland/wlfreerdp.1.in
@ -2,19 +2,19 @@
 \\$2 \(laURL: \\$1 \(ra\\$3
 ..
 .if \n[.g] .mso www.tmac
-.TH wlfreerdp 1 2017-01-12 "@FREERDP_VERSION_FULL@" "FreeRDP"
+.TH @MANPAGE_NAME@ 1 2017-01-12 "@FREERDP_VERSION_FULL@" "FreeRDP"
 .SH NAME
-wlfreerdp \- FreeRDP wayland client
+@MANPAGE_NAME@ \- FreeRDP wayland client
 .SH SYNOPSIS
-.B wlfreerdp
+.B @MANPAGE_NAME@
 [file]
 [\fIdefault_client_options\fP]
 [\fB/v\fP:<server>[:port]]
 [\fB/version\fP]
 [\fB/help\fP]
 .SH DESCRIPTION
-.B wlfreerdp
-is a wayland Remote Desktop Protocol (RDP) client which is part of the FreeRDP project. A RDP server is built-in to many editions of Windows. Alternative servers included xrdp and VRDP (VirtualBox).  
+.B @MANPAGE_NAME@
+is a wayland Remote Desktop Protocol (RDP) client which is part of the FreeRDP project. A RDP server is built-in to many editions of Windows.. Alternative servers included ogon, gnome-remote-desktop, xrdp and VRDP (VirtualBox).
 .SH OPTIONS
 The wayland client also supports a lot of the \fIdefault client options\fP which are not described here. For details on those see the xfreerdp(1) man page.
 .IP \fB/v:\fP\fI<server>[:port]\fP
--- a/client/X11/man/CMakeLists.txt
+++ b/client/X11/man/CMakeLists.txt
@ -3,4 +3,9 @@ set(DEPS
        xfreerdp-examples.1.xml
        xfreerdp-envvar.1.xml
    )
-generate_and_install_freerdp_man_from_xml(xfreerdp.1 ${DEPS})
+
+set(MANPAGE_NAME ${PROJECT_NAME})
+if (WITH_BINARY_VERSIONING)
+	set(MANPAGE_NAME ${PROJECT_NAME}${PROJECT_VERSION_MAJOR})
+endif()
+generate_and_install_freerdp_man_from_xml(${PROJECT_NAME}.1 ${MANPAGE_NAME}.1 ${DEPS})
--- a/client/X11/man/xfreerdp.1.xml.in
+++ b/client/X11/man/xfreerdp.1.xml.in
@ -17,13 +17,13 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	</author>
 	</refentryinfo>
 	<refmeta>
-	<refentrytitle>xfreerdp</refentrytitle>
+	<refentrytitle>@MANPAGE_NAME@</refentrytitle>
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">freerdp</refmiscinfo>
-	<refmiscinfo class="manual">xfreerdp</refmiscinfo>
+	<refmiscinfo class="manual">@MANPAGE_NAME@</refmiscinfo>
 	</refmeta>
 	<refnamediv>
-	<refname><application>xfreerdp</application></refname>
+	<refname><application>@MANPAGE_NAME@</application></refname>
 	<refpurpose>FreeRDP X11 client</refpurpose>
 	</refnamediv>
 	<refsynopsisdiv>
@ -31,7 +31,7 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 		<date>@MAN_TODAY@</date>
 	</refsynopsisdivinfo>
 	<para>
-		<command>xfreerdp</command> [file] [options] [/v:server[:port]]
+		<command>@MANPAGE_NAME@</command> [file] [options] [/v:server[:port]]
 	</para>
 	</refsynopsisdiv>
 	<refsect1>
@ -40,9 +40,10 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	</refsect1info>
 	<title>DESCRIPTION</title>
 	<para>
-		<command>xfreerdp</command> is an X11 Remote Desktop Protocol (RDP)
+		<command>@MANPAGE_NAME@</command> is an X11 Remote Desktop Protocol (RDP)
 		client which is part of the FreeRDP project. An RDP server is built-in
-		to many editions of Windows. Alternative servers included xrdp and VRDP (VirtualBox).
+		to many editions of Windows. Alternative servers included ogon, gnome-remote-desktop,
+		xrdp and VRDP (VirtualBox).
 	</para>
 	</refsect1>

--- a/cmake/InstallFreeRDPMan.cmake
+++ b/cmake/InstallFreeRDPMan.cmake
@ -7,7 +7,7 @@ function(install_freerdp_man manpage section)
 endif()
 endfunction()

-function(generate_and_install_freerdp_man_from_xml manpage dependencies)
+function(generate_and_install_freerdp_man_from_xml template manpage dependencies)
    if(WITH_MANPAGES)
 	find_program(XSLTPROC_EXECUTABLE NAMES xsltproc REQUIRED)
 	if (NOT DOCBOOKXSL_FOUND)
@ -20,7 +20,7 @@ function(generate_and_install_freerdp_man_from_xml manpage dependencies)

 	TODAY(MAN_TODAY)

-	configure_file(${manpage}.xml.in ${manpage}.xml @ONLY IMMEDIATE)
+	configure_file(${template}.xml.in ${manpage}.xml @ONLY IMMEDIATE)

 	set(dep_SRC)
 	foreach(dep ${dependencies})
@ -31,7 +31,7 @@ function(generate_and_install_freerdp_man_from_xml manpage dependencies)
 	add_custom_command(
                OUTPUT ${manpage}
                                COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_docbook
-				COMMAND ${XSLTPROC_EXECUTABLE} -v --path ${CMAKE_CURRENT_SOURCE_DIR} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
+				COMMAND ${XSLTPROC_EXECUTABLE} --path ${CMAKE_CURRENT_SOURCE_DIR} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml
 				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 				DEPENDS
 					${CMAKE_CURRENT_BINARY_DIR}/${manpage}.xml
@ -42,7 +42,7 @@ function(generate_and_install_freerdp_man_from_xml manpage dependencies)
                DEPENDS
 			${manpage}
                        ${manpage}.xml
-                        ${manpage}.xml.in
+                        ${template}.xml.in
                        generate_argument_docbook
 		)
 	install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${manpage} 1)
--- a/server/proxy/cli/CMakeLists.txt
+++ b/server/proxy/cli/CMakeLists.txt
@ -39,8 +39,13 @@ add_executable(${APP_NAME}
    ${PROXY_APP_SRCS}
 )

+set(MANPAGE_NAME ${APP_NAME}.1)
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${APP_NAME} PROPERTIES OUTPUT_NAME "${APP_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${APP_NAME}
+	       	PROPERTIES
+	       	OUTPUT_NAME "${APP_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}"
+	)
+	set(MANPAGE_NAME ${APP_NAME}${FREERDP_API_VERSION}.1)
 endif()

 target_link_libraries(${APP_NAME} ${MODULE_NAME})
@ -51,5 +56,5 @@ endif()

 set_property(TARGET ${APP_NAME} PROPERTY FOLDER "Server/proxy")

-configure_file(${APP_NAME}.1.in ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}.1 1)
+configure_file(${APP_NAME}.1.in ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME})
+install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME} 1)
--- a/server/proxy/cli/freerdp-proxy.1.in
+++ b/server/proxy/cli/freerdp-proxy.1.in
@ -2,11 +2,11 @@
 \\$2 \(laURL: \\$1 \(ra\\$3
 ..
 .if \n[.g] .mso www.tmac
-.TH freerdp\-proxy 1 2023-12-14 "@FREERDP_VERSION_FULL@" "FreeRDP"
+.TH @MANPAGE_NAME@ 1 2023-12-14 "@FREERDP_VERSION_FULL@" "FreeRDP"
 .SH NAME
-freerdp\-proxy \- A server binary allowing MITM proxying of RDP connections
+@MANPAGE_NAME@ \- A server binary allowing MITM proxying of RDP connections
 .SH SYNOPSIS
-.B freerdp\-proxy
+.B @MANPAGE_NAME@
 [\fB-h\fP]
 [\fB--help\fP]
 [\fB--buildconfig\fP]
@ -15,12 +15,16 @@ freerdp\-proxy \- A server binary allowing MITM proxying of RDP connections
 [\fB--version\fP]
 [\fB<config file>\fP]
 .SH DESCRIPTION
-.B freerdp\-proxy
+.B @MANPAGE_NAME@
 can be used to proxy a RDP connection between a target server and connecting clients.
 Possible usage scenarios are:
-* Proxying outdated RDP servers behind a (more secure) proxy
-* Protocol analysis
-* MITM proxy for 
+.IP Proxying
+Connect outdated/insecure RDP servers from behind a (more secure) proxy
+.IP Analysis
+Allow detailed protocol analysis of (many) unknown protocol features (channels)
+.IP Inspection
+MITM proxy for session inspection and recording
+
 .SH OPTIONS
 .IP -h,--help
 Display a help text explaining usage.
@ -33,15 +37,16 @@ Dump a template configuration to \fB<config-ini-file>\fP
 .IP \fB<config-ini-file>\fP
 Start the proxy with settings read from \fB<config-ini-file>\fP

-\fBWarning\fP: The proxy does not support authentication out of the box but acts simply as intermediary.
+.SH WARNING
+The proxy does not support authentication out of the box but acts simply as intermediary.
 Only \fBRDP\fP and \fBTLS\fP security modes are supported, \fBNLA\fP will fail for connections to the proxy.
 To implement authentication a \fBproxy-module\fP can be implemented that can authenticate against some backend
 and map connecting users and credentials to target server users and credentials.

 .SH EXAMPLES
-freerdp-proxy /some/config/file
+@MANPAGE_NAME@ /some/config/file

-freerdp-proxy --dump-config /some/config/file
+@MANPAGE_NAME@ --dump-config /some/config/file

 .SH PREPARATIONS

@ -51,7 +56,7 @@ freerdp-proxy --dump-config /some/config/file

 2. generate proxy configuration

-\fBfreerdp-proxy --dump-config proxy.ini\fP
+\fB@MANPAGE_NAME@ --dump-config proxy.ini\fP

 3. edit configurartion and:

@ -63,7 +68,7 @@ freerdp-proxy --dump-config /some/config/file

 3. start proxy server

- \fBfreerdp-proxy proxy.ini\fP
+ \fB@MANPAGE_NAME@ proxy.ini\fP

 .SH EXIT STATUS
 .TP
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@ -202,8 +202,10 @@ endif()

 add_executable(${MODULE_NAME} ${SRCS})

+set(MANPAGE_NAME "${MODULE_NAME}")
 if (WITH_BINARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${FREERDP_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set(MANPAGE_NAME "${MODULE_NAME}${FREERDP_API_VERSION}")
 endif()

 list(APPEND LIBS freerdp-shadow-subsystem freerdp-shadow freerdp winpr)
@ -220,8 +222,8 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/shadow")

 include(pkg-config-install-prefix)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp-shadow.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow${FREERDP_VERSION_MAJOR}.pc @ONLY)
-configure_file(freerdp-shadow-cli.1.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow-cli.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow-cli.1 1)
+configure_file(freerdp-shadow-cli.1.in ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1)
+install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1 1)

 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow${FREERDP_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

--- a/server/shadow/freerdp-shadow-cli.1.in
+++ b/server/shadow/freerdp-shadow-cli.1.in
@ -2,11 +2,11 @@
 \\$2 \(laURL: \\$1 \(ra\\$3
 ..
 .if \n[.g] .mso www.tmac
-.TH freerdp\-shadow\-cli 1 2017-01-12 "@FREERDP_VERSION_FULL@" "FreeRDP"
+.TH @MANPAGE_NAME@ 1 2017-01-12 "@FREERDP_VERSION_FULL@" "FreeRDP"
 .SH NAME
-freerdp\-shadow\-cli \- A utility for sharing a X display via RDP.
+@MANPAGE_NAME@ \- A utility for sharing a X display via RDP.
 .SH SYNOPSIS
-.B freerdp\-shadow\-cli
+.B @MANPAGE_NAME@
 [\fB/port:\fP\fI<port number>\fP]
 [\fB/ipc-socket:\fP\fI<ipc-socket>\fP]
 [\fB/monitors:\fP\fI<0,1,2,...>\fP]
@ -23,7 +23,7 @@ freerdp\-shadow\-cli \- A utility for sharing a X display via RDP.
 [\fB/version\fP]
 [\fB/help\fP]
 .SH DESCRIPTION
-.B freerdp\-shadow\-cli
+.B @MANPAGE_NAME@
 can be used to share a running X display like with VNC but by using the RDP
 instead. It is also possibly to share only parts (rect) of the display.
 .SH OPTIONS
@ -40,7 +40,7 @@ Select rectangle within monitor to share.
 .IP -auth
 Disable authentication. If authentication is enabled PAM is used with the
 X11 subsystem. Running as root is not necessary, however if run as user only
-the same user that started freerdp\-shadow\-cli can authenticate.
+the same user that started @MANPAGE_NAME@ can authenticate.
 .br
 \fBWarning\fP: If authentication is disabled \fIeveryone\fP can connect.
 .IP -may-view
@ -65,7 +65,7 @@ Print the version and exit.
 Print the help and exit.

 .SH EXAMPLES
-freerdp-shadow-cli /port:12345
+@MANPAGE_NAME@ /port:12345

 When run as user within a X session (for example from an xterm) a socket on
 12345 is opened and the current display is shared via RDP.
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@ -357,7 +357,12 @@ endif()

 add_subdirectory(include)

-install_freerdp_man(wlog.7 7)
+set(MANPAGE_NAME wlog)
+if (WITH_BINARY_VERSIONING)
+	set(MANPAGE_NAME wlog${WINPR_API_VERSION})
+endif()
+configure_file(wlog.7.in ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.7 @ONLY@)
+install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.7  7)
 # Exporting

 export(PACKAGE winpr)
--- a/winpr/tools/hash-cli/CMakeLists.txt
+++ b/winpr/tools/hash-cli/CMakeLists.txt
@ -41,8 +41,10 @@ add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})

 set(${MODULE_PREFIX}_LIBS winpr)

+set(MANPAGE_NAME "${MODULE_NAME}")
 if (WITH_BINARY_VERSIONING)
 	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+        set(MANPAGE_NAME "${MODULE_NAME}${WINPR_API_VERSION}")
 endif()
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

@ -53,5 +55,5 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
 endif()

 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
-configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)
+configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1)
+install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1 1)
--- a/winpr/tools/hash-cli/winpr-hash.1.in
+++ b/winpr/tools/hash-cli/winpr-hash.1.in
@ -1,15 +1,15 @@
-.TH winpr-hash 1 2017-01-11 "@WINPR_VERSION_FULL@" "FreeRDP"
+.TH @MANPAGE_NAME@ 1 2017-01-11 "@WINPR_VERSION_FULL@" "FreeRDP"
 .SH NAME
-winpr-hash \- NTLM hashing tool
+@MANPAGE_NAME@ \- NTLM hashing tool
 .SH SYNOPSIS
-.B winpr-hash
+.B @MANPAGE_NAME@
 \fB-u\fP username
 \fB-p\fP password
 [\fB-d\fP domain]
 [\fB-f\fP { \fIdefault\fP | sam }]
 [\fB-v\fP { \fI1\fP | 2 }]
 .SH DESCRIPTION
-.B winpr-hash
+.B @MANPAGE_NAME@
 is a small utility that can be used to create a NTLM hash from a username and password pair. The created hash can be outputed as plain hash or in SAM format.
 .SH OPTIONS
 .IP "-u username"
@ -28,7 +28,7 @@ user:domain::hash:::
 Version allows it to specify the NTLM version to use. The default is to use version 1. In case
 version 2 is used a domain needs to be specified.
 .SH EXAMPLES
-winpr-hash -u \fIuser\fP -p \fIpassword\fP -d \fIdomain\fP -f \fIsam\fP -v \fI2\fP
+@MANPAGE_NAME@ -u \fIuser\fP -p \fIpassword\fP -d \fIdomain\fP -f \fIsam\fP -v \fI2\fP

 Create a version \fI2\fP NTLM hash for \fIuser\fP with \fIdomain\fP and \fIpassword\fP and output it in \fIsam\fP format.
 .SH EXIT STATUS
--- a/winpr/tools/makecert-cli/CMakeLists.txt
+++ b/winpr/tools/makecert-cli/CMakeLists.txt
@ -44,8 +44,13 @@ set(${MODULE_PREFIX}_LIBS winpr-tools)

 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)

+set(MANPAGE_NAME ${MODULE_NAME})
 if (WITH_BINARY_VERSIONING)
-	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}")
+	set_target_properties(${MODULE_NAME}
+	       	PROPERTIES
+	       	OUTPUT_NAME "${MODULE_NAME}${WINPR_API_VERSION}${CMAKE_EXECUTABLE_SUFFIX}"
+	)
+	set(MANPAGE_NAME ${MODULE_NAME}${WINPR_API_VERSION})
 endif()
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")

@ -54,5 +59,5 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
 endif()

-configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1)
-install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)
+configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1)
+install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/${MANPAGE_NAME}.1 1)
--- a/winpr/tools/makecert-cli/winpr-makecert.1.in
+++ b/winpr/tools/makecert-cli/winpr-makecert.1.in
@ -2,11 +2,11 @@
 \\$2 \(laURL: \\$1 \(ra\\$3
 ..
 .if \n[.g] .mso www.tmac
-.TH winpr\-makecert 1 2017-01-11 "@WINPR_VERSION_FULL@" "FreeRDP"
+.TH @MANPAGE_NAME@ 1 2017-01-11 "@WINPR_VERSION_FULL@" "FreeRDP"
 .SH NAME
-winpr\-makecert \- A tool to create X.509 certificates.
+@MANPAGE_NAME@ \- A tool to create X.509 certificates.
 .SH SYNOPSIS
-.B winpr\-makecert
+.B @MANPAGE_NAME@
 [\fB-rdp\fP]
 [\fB-silent\fP]
 [\fB-live\fP]
@ -21,15 +21,15 @@ winpr\-makecert \- A tool to create X.509 certificates.
 [\fB-path\fP outputpath] 
 [outputname]
 .SH DESCRIPTION
-.B winpr-makecert
+.B @MANPAGE_NAME@
 is a tool for generating X.509 certificates modeled after the Windows command
-MakeCert. winpr-makecert aims to be command line compatible with MakeCert
+MakeCert. @MANPAGE_NAME@ aims to be command line compatible with MakeCert
 however not all options are supported or implemented yet.

 Unimplemented features are not described here. They are marked as "Unsupported"
-in winpr-makecerts help.
+in @MANPAGE_NAME@s help.

-In contrast to it's Windows counterpart winpr\-makecert does, unless the
+In contrast to it's Windows counterpart @MANPAGE_NAME@ does, unless the
 \fB\-live\fP option is given, always creates and save a certificate.
 If \fIoutputname\fP isn't set it is tried to determine the host name of the
 computer the command is run on.
@ -88,14 +88,14 @@ A directory where the certificate should be created in.
 The base name of the created file(s). A suffix, the format specific suffix is
 appended to this name.
 .SH EXAMPLES
-winpr-makecert -rdp
+@MANPAGE_NAME@ -rdp

 Creates a certificate with the default properties, saved to a file in the
 current working directory in crt format named like the host. If the host is
 named freerdp the created files are called freerdp.key and freerdp.crt. 


-winpr-makecert -len 4096 -a sha384 -path /tmp -# 22 -m 144 -y 1 -format crt mycert
+@MANPAGE_NAME@ -len 4096 -a sha384 -path /tmp -# 22 -m 144 -y 1 -format crt mycert

 The command above creates the file /tmp/mycert.pem containing a key and a
 certificate with a length of 4096. It will use sha384 as hash algorithm.
--- a/winpr/wlog.7.in
+++ b/winpr/wlog.7.in