Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-13 00:17:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix manpage directory

Browse source 
This installed files in man/ directly, instead of in man/man1/, so
they weren't installed.

See #5696.
This commit is contained in:
Fabian Homborg 2019-02-25 21:12:08 +01:00
parent 0e82fb8c47
commit 3674efad0b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/Docs.cmake
View file

@ -30,7 +30,8 @@ ADD_CUSTOM_TARGET(sphinx-manpages
-c "${SPHINX_SRC_DIR}" -c "${SPHINX_SRC_DIR}"
-d "${SPHINX_CACHE_DIR}" -d "${SPHINX_CACHE_DIR}"
"${SPHINX_SRC_DIR}" "${SPHINX_SRC_DIR}"
"${SPHINX_MANPAGE_DIR}" # TODO: This only works if we only have section 1 manpages.
"${SPHINX_MANPAGE_DIR}/man1"
COMMENT "Building man pages with Sphinx") COMMENT "Building man pages with Sphinx")
IF(SPHINX_EXECUTABLE) IF(SPHINX_EXECUTABLE)

4
cmake/Install.cmake
View file

@ -153,8 +153,8 @@ INSTALL(DIRECTORY share/groff
# $v test -z "$(wildcard share/man/man1/*.1)" || $(INSTALL) -m 644 $(filter-out $(addprefix share/man/man1/, $(CONDEMNED_PAGES)), $(wildcard share/man/man1/*.1)) $(DESTDIR)$(datadir)/fish/man/man1/ # $v test -z "$(wildcard share/man/man1/*.1)" || $(INSTALL) -m 644 $(filter-out $(addprefix share/man/man1/, $(CONDEMNED_PAGES)), $(wildcard share/man/man1/*.1)) $(DESTDIR)$(datadir)/fish/man/man1/
# CONDEMNED_PAGE is managed by the conditional above # CONDEMNED_PAGE is managed by the conditional above
# Building the man pages is optional: if doxygen isn't installed, they're not built # Building the man pages is optional: if sphinx isn't installed, they're not built
INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/man/man1/ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/
DESTINATION ${rel_datadir}/fish/man/man1 DESTINATION ${rel_datadir}/fish/man/man1
FILES_MATCHING FILES_MATCHING
PATTERN "*.1" PATTERN "*.1"