From e4d4814168405c1eaea94ebf75883e7b166b9eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 29 Mar 2021 20:03:59 +0100 Subject: [PATCH] Don't install HTML manuals twice. Wireshark loads HTML files as resources from "/usr/share/wireshark" on Unix-like systems and from the $build/run directory when run that way. There are also other locations specific to other platforms and packaging solutions and multi-config builds. HTML manuals are installed both to "/usr/share/wireshark" and "/usr/share/doc/wireshark" for Unix-like systems. For now install them only to the former to avoid unnecessary clutter and duplication. The manuals can be consulted using 'man' or launched in HTML format from Wireshark's help menu (or found in $pkgdatadir instead of $docdir). Eventually we may want to simplify that maze of locations for HTML resources and have Wireshark load the manuals from $docdir instead on Unix, and do the right thing for the other platforms, etc. --- doc/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 5dd284936c..d495fa24cc 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -224,12 +224,10 @@ install( ${CMAKE_INSTALL_MANDIR}/man4 ) -install( - FILES - ${HTML_INSTALL_FILES} - DESTINATION - ${CMAKE_INSTALL_DOCDIR} -) +# +# Installation of HTML manuals is done +# elsewhere to CMAKE_INSTALL_DATADIR. +# # # Editor modelines - https://www.wireshark.org/tools/modelines.html