[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
Wed Apr 5 08:00:57 PDT 2017


jroelofs updated this revision to Diff 94232.

https://reviews.llvm.org/D30906

Files:
  cmake/modules/AddSphinxTarget.cmake


Index: cmake/modules/AddSphinxTarget.cmake
===================================================================
--- cmake/modules/AddSphinxTarget.cmake
+++ cmake/modules/AddSphinxTarget.cmake
@@ -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)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30906.94232.patch
Type: text/x-patch
Size: 879 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170405/0b3d7364/attachment.bin>


More information about the llvm-commits mailing list