[Cmake-commits] CMake branch, next, updated. v3.6.2-2546-g29c4330

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  29c433076f24abce950e4b5c6e8eca90cbd21bd6 (commit)
       via  956054aeca0cff2ef5a8c92586e992cc9ad51d7d (commit)
      from  f1a15af9af00486f927870f149b4e30f185b64e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29c433076f24abce950e4b5c6e8eca90cbd21bd6
commit 29c433076f24abce950e4b5c6e8eca90cbd21bd6
Merge: f1a15af 956054a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 27 08:35:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 27 08:35:07 2016 -0400

    Merge topic 'GNUInstallDirs-more-BSD' into next
    
    956054ae GNUInstallDirs: All *BSDs use ${PREFIX}/{man,info} for man and info pages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=956054aeca0cff2ef5a8c92586e992cc9ad51d7d
commit 956054aeca0cff2ef5a8c92586e992cc9ad51d7d
Author:     Dmitry Marakasov <amdmi3 at amdmi3.ru>
AuthorDate: Mon Sep 26 18:22:16 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 27 08:33:57 2016 -0400

    GNUInstallDirs: All *BSDs use ${PREFIX}/{man,info} for man and info pages

diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 0c80b8a..c58d77b 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -265,7 +265,7 @@ if(NOT CMAKE_INSTALL_DATADIR)
   set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
   if(NOT CMAKE_INSTALL_INFODIR)
     set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (info)")
     set(CMAKE_INSTALL_INFODIR "info")

-----------------------------------------------------------------------

Summary of changes:
 Modules/GNUInstallDirs.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake