morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Install man pages

Browse Source 
* man pages are only build/installed if WITH_MANPAGES is enabled
* create a new cmake function install_freerdp_man to unified install man
  pages
* install all man pages using the new function
* update the nightly packages accordingly
This commit is contained in:
Bernhard Miklautz
2017-01-16 11:34:32 +01:00
parent 9c0e3e3300
commit d817469b78
10 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -67,6 +67,7 @@ include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(GNUInstallDirsWrapper) include(GNUInstallDirsWrapper)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
include(InstallFreeRDPMan)
# Soname versioning # Soname versioning
set(BUILD_NUMBER 0) set(BUILD_NUMBER 0)

1
client/Wayland/CMakeLists.txt
View File

@@ -40,3 +40,4 @@ install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cli
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Wayland")
configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1) configure_file(wlfreerdp.1.in ${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1)
install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/wlfreerdp.1 1)

6
client/X11/CMakeLists.txt
View File

@@ -111,11 +111,7 @@ if(WITH_MANPAGES)
add_custom_target(xfreerdp.manpage ALL add_custom_target(xfreerdp.manpage ALL
DEPENDS xfreerdp.1) DEPENDS xfreerdp.1)
if(OPENBSD) install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION man/man1)
else()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
endif()
else() else()
message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed") message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed")
endif() endif()

9
cmake/InstallFreeRDPMan.cmake Normal file
View File

@@ -0,0 +1,9 @@
function(install_freerdp_man manpage section)
if(WITH_MANPAGES)
if(OPENBSD)
install(FILES ${manpage} DESTINATION man/man${section})
else()
install(FILES ${manpage} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man${section})
endif()
endif()
endfunction()

4
packaging/deb/freerdp-nightly/freerdp-nightly.install
View File

@@ -1,4 +1,8 @@
opt/freerdp-nightly/lib/*.so.* opt/freerdp-nightly/lib/*.so.*
opt/freerdp-nightly/bin opt/freerdp-nightly/bin
opt/freerdp-master/share/man/man1/freerdp-shadow-cli.1*
opt/freerdp-master/share/man/man1/winpr-makecert.1*
opt/freerdp-master/share/man/man1/winpr-hash.1*
opt/freerdp-master/share/man/man1/wlfreerdp.1*
opt/freerdp-nightly/share/man/man1/xfreerdp.1* opt/freerdp-nightly/share/man/man1/xfreerdp.1*
opt/freerdp-nightly/share/man/man7/wlog.7* opt/freerdp-nightly/share/man/man7/wlog.7*

4
packaging/rpm/freerdp-nightly.spec
View File

@@ -139,6 +139,10 @@ export NO_BRP_CHECK_RPATH true
%{INSTALL_PREFIX}/%{_lib}/*.so.* %{INSTALL_PREFIX}/%{_lib}/*.so.*
%{INSTALL_PREFIX}/bin/ %{INSTALL_PREFIX}/bin/
%{INSTALL_PREFIX}/share/man/man1/xfreerdp.1* %{INSTALL_PREFIX}/share/man/man1/xfreerdp.1*
%{INSTALL_PREFIX}/share/man/man1/freerdp-shadow-cli.1*
%{INSTALL_PREFIX}/share/man/man1/winpr-makecert.1*
%{INSTALL_PREFIX}/share/man/man1/winpr-hash.1*
%{INSTALL_PREFIX}/share/man/man1/wlfreerdp.1*
%{INSTALL_PREFIX}/share/man/man7/wlog.7* %{INSTALL_PREFIX}/share/man/man7/wlog.7*
%files devel %files devel

1
server/shadow/CMakeLists.txt
View File

@@ -339,6 +339,7 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/shadow")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp-shadow.pc.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow${FREERDP_VERSION_MAJOR}.pc @ONLY) 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) 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)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow${FREERDP_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp-shadow${FREERDP_VERSION_MAJOR}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

9
winpr/CMakeLists.txt
View File

@@ -176,14 +176,7 @@ if(BUILD_TESTING)
add_subdirectory(test) add_subdirectory(test)
endif() endif()
if(WITH_MANPAGES) install_freerdp_man(wlog.7 7)
if(OPENBSD)
install(FILES wlog.7 DESTINATION man/man7)
else()
install(FILES wlog.7 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man7)
endif()
endif(WITH_MANPAGES)
# Exporting # Exporting
if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")

1
winpr/tools/hash-cli/CMakeLists.txt
View File

@@ -51,3 +51,4 @@ endif()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1) configure_file(winpr-hash.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1)
install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-hash.1 1)

1
winpr/tools/makecert-cli/CMakeLists.txt
View File

@@ -52,3 +52,4 @@ if (WITH_DEBUG_SYMBOLS AND MSVC)
endif() endif()
configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1) configure_file(winpr-makecert.1.in ${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1)
install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/winpr-makecert.1 1)