r253693 - Honor system specific paths of MAN pages

Chris Bieneman via cfe-commits cfe-commits at lists.llvm.org
Fri Nov 20 10:49:03 PST 2015


Author: cbieneman
Date: Fri Nov 20 12:49:02 2015
New Revision: 253693

URL: http://llvm.org/viewvc/llvm-project?rev=253693&view=rev
Log:
Honor system specific paths of MAN pages

Summary: Caught on NetBSD.

Patch by: Kamil Rytarowski (krytarowski)

Reviewers: beanz, jroelofs

Subscribers: cfe-commits, joerg

Differential Revision: http://reviews.llvm.org/D14800

Modified:
    cfe/trunk/INSTALL.txt
    cfe/trunk/tools/scan-build/CMakeLists.txt

Modified: cfe/trunk/INSTALL.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/INSTALL.txt?rev=253693&r1=253692&r2=253693&view=diff
==============================================================================
--- cfe/trunk/INSTALL.txt (original)
+++ cfe/trunk/INSTALL.txt Fri Nov 20 12:49:02 2015
@@ -45,5 +45,4 @@ compiler and header files into the prefi
 configured.
 
 The Clang compiler is available as 'clang' and 'clang++'. It supports a gcc like
-command line interface. See the man page for clang (installed into
-$prefix/share/man/man1) for more information.
+command line interface. See the man page for clang for more information.

Modified: cfe/trunk/tools/scan-build/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build/CMakeLists.txt?rev=253693&r1=253692&r2=253693&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build/CMakeLists.txt (original)
+++ cfe/trunk/tools/scan-build/CMakeLists.txt Fri Nov 20 12:49:02 2015
@@ -1,5 +1,7 @@
 option(CLANG_INSTALL_SCANBUILD "Install the scan-build tool" ON)
 
+include(GNUInstallDirs)
+
 if (WIN32 AND NOT CYGWIN)
   set(BinFiles
         scan-build.bat)
@@ -52,15 +54,15 @@ if(CLANG_INSTALL_SCANBUILD)
   endforeach()
 
   foreach(ManPage ${ManPages})
-    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/man/man1/${ManPage}
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/${ManPage}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
-                         ${CMAKE_BINARY_DIR}/share/man/man1
+                         ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1
                        COMMAND ${CMAKE_COMMAND} -E copy
                          ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage}
-                         ${CMAKE_BINARY_DIR}/share/man/man1/
+                         ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage})
-    list(APPEND Depends ${CMAKE_BINARY_DIR}/share/man/man1/${ManPage})
-    install(PROGRAMS man/${ManPage} DESTINATION share/man/man1)
+    list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/${ManPage})
+    install(PROGRAMS man/${ManPage} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
   endforeach()
 
   foreach(ShareFile ${ShareFiles})
@@ -78,4 +80,3 @@ if(CLANG_INSTALL_SCANBUILD)
   add_custom_target(scan-build ALL DEPENDS ${Depends})
   set_target_properties(scan-build PROPERTIES FOLDER "Misc")
 endif()
-




More information about the cfe-commits mailing list