From 3674efad0ba0373e0614690240652a81f2b9f09a Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Mon, 25 Feb 2019 21:12:08 +0100 Subject: [PATCH] Fix manpage directory This installed files in man/ directly, instead of in man/man1/, so they weren't installed. See #5696. --- cmake/Docs.cmake | 3 ++- cmake/Install.cmake | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake index 0d30abba0..a197f9372 100644 --- a/cmake/Docs.cmake +++ b/cmake/Docs.cmake @@ -30,7 +30,8 @@ ADD_CUSTOM_TARGET(sphinx-manpages -c "${SPHINX_SRC_DIR}" -d "${SPHINX_CACHE_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") IF(SPHINX_EXECUTABLE) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 7b78495d3..4ef166c3a 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -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/ # CONDEMNED_PAGE is managed by the conditional above -# Building the man pages is optional: if doxygen isn't installed, they're not built -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/man/man1/ +# Building the man pages is optional: if sphinx isn't installed, they're not built +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/user_doc/man/man1/ DESTINATION ${rel_datadir}/fish/man/man1 FILES_MATCHING PATTERN "*.1"