[PATCH] D30906: Revert r297545 - Revert r297516 - Respect CMAKE_INSTALL_MANDIR for sphinx generated manpages

Jonathan Roelofs via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 28 11:19:46 PDT 2017


jroelofs added a comment.

@beanz what about something like this (untested):

  Index: cmake/modules/AddSphinxTarget.cmake
  ===================================================================
  --- cmake/modules/AddSphinxTarget.cmake	(revision 298777)
  +++ cmake/modules/AddSphinxTarget.cmake	(working copy)
  @@ -48,10 +48,15 @@
       # Handle installation
       if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
         if (builder STREQUAL man)
  +        if (CMAKE_INSTALL_MANDIR)
  +          set(INSTALL_MANDIR ${CMAKE_INSTALL_MANDIR}/)
  +        else
  +          set(INSTALL_MANDIR share/man/)
  +        endif
           # FIXME: We might not ship all the tools that these man pages describe
           install(DIRECTORY "${SPHINX_BUILD_DIR}/" # Slash indicates contents of
                   COMPONENT "${project}-sphinx-man"
  -                DESTINATION share/man/man1)
  +                DESTINATION ${INSTALL_MANDIR}man1)
   
         elseif (builder STREQUAL html)
           string(TOUPPER "${project}" project_upper)


https://reviews.llvm.org/D30906





More information about the llvm-commits mailing list