[llvm] r297516 - Respect CMAKE_INSTALL_MANDIR for sphinx generated manpages

[Jonathan Roelofs via llvm-commits]

On 3/10/17 7:44 PM, Eric Fiselier wrote:
> FYI I reverted this in r297545 because it caused the doc to be 
> installed under "/man1" if CMAKE_INSTALL_MANDIR isn't defined, and it 
> wasn't defined for me.

Sorry about that. Misread the docs... looks like it's supposed to be:

${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1


Jon

>
>
> On Fri, Mar 10, 2017 at 2:44 PM, Jonathan Roelofs via llvm-commits 
> <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
>
>     Author: jroelofs
>     Date: Fri Mar 10 15:44:16 2017
>     New Revision: 297516
>
>     URL: http://llvm.org/viewvc/llvm-project?rev=297516&view=rev
>     <http://llvm.org/viewvc/llvm-project?rev=297516&view=rev>
>     Log:
>     Respect CMAKE_INSTALL_MANDIR for sphinx generated manpages
>
>     Modified:
>         llvm/trunk/cmake/modules/AddSphinxTarget.cmake
>
>     Modified: llvm/trunk/cmake/modules/AddSphinxTarget.cmake
>     URL:
>     http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=297516&r1=297515&r2=297516&view=diff
>     <http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddSphinxTarget.cmake?rev=297516&r1=297515&r2=297516&view=diff>
>     ==============================================================================
>     --- llvm/trunk/cmake/modules/AddSphinxTarget.cmake (original)
>     +++ llvm/trunk/cmake/modules/AddSphinxTarget.cmake Fri Mar 10
>     15:44:16 2017
>     @@ -51,7 +51,7 @@ function (add_sphinx_target builder proj
>              # 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 ${CMAKE_INSTALL_MANDIR}/man1)
>
>            elseif (builder STREQUAL html)
>              string(TOUPPER "${project}" project_upper)
>
>
>     _______________________________________________
>     llvm-commits mailing list
>     llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
>     http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>     <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
>
>

-- 
Jon Roelofs
jonathan at codesourcery.com
CodeSourcery / Mentor Embedded

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170312/43493575/attachment.html>