osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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.
This commit is contained in:
João Valverde 2021-03-29 20:03:59 +01:00
parent d08fa84025
commit e4d4814168
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/CMakeLists.txt
View File

@ -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